[前][次][番号順一覧][スレッド一覧]

ruby-changes:50865

From: nobu <ko1@a...>
Date: Tue, 3 Apr 2018 17:29:56 +0900 (JST)
Subject: [ruby-changes:50865] nobu:r63072 (trunk): Honor --silent option

nobu	2018-04-03 17:29:51 +0900 (Tue, 03 Apr 2018)

  New Revision: 63072

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63072

  Log:
    Honor --silent option

  Modified files:
    trunk/configure.ac
    trunk/tool/m4/_colorize_result_prepare.m4
    trunk/tool/m4/colorize_result.m4
Index: configure.ac
===================================================================
--- configure.ac	(revision 63071)
+++ configure.ac	(revision 63072)
@@ -35,7 +35,7 @@ AS_IF([test "$HAVE_BASERUBY" = yes -a "` https://github.com/ruby/ruby/blob/trunk/configure.ac#L35
     AS_IF([test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42], [
 	BASERUBY="$BASERUBY --disable=gems"
     ])
-    $BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub
+    $BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub >&AS_MESSAGE_FD
 ], [
     BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
     HAVE_BASERUBY=no
@@ -3743,7 +3743,7 @@ guard=INCLUDE_RUBY_CONFIG_H https://github.com/ruby/ruby/blob/trunk/configure.ac#L3743
 (
   AS_IF([test "x$CONFIGURE_TTY" = xyes], [color=--color], [color=])
   exec ${srcdir}/tool/ifchange $color "${config_h}" -
-) || AC_MSG_ERROR([failed to create ${config_h}])
+) >&AS_MESSAGE_FD || AC_MSG_ERROR([failed to create ${config_h}])
 tr -d '\015' < largefile.h > confdefs.h
 rm largefile.h
 
@@ -3857,6 +3857,7 @@ AC_OUTPUT https://github.com/ruby/ruby/blob/trunk/configure.ac#L3857
 }
 }
 
+AS_IF([test "$silent" = yes], [], [
 AS_IF([${FOLD+:} false], [], [
 AS_IF([test "`echo abcdefg hijklmno | fold -s -w10 | sed 1d`" = hijklmno], [FOLD="fold"], [FOLD=])
 ])
@@ -3902,3 +3903,4 @@ config_summary "search path"         "$s https://github.com/ruby/ruby/blob/trunk/configure.ac#L3903
 config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
 echo ""
 echo "---"
+])
Index: tool/m4/_colorize_result_prepare.m4
===================================================================
--- tool/m4/_colorize_result_prepare.m4	(revision 63071)
+++ tool/m4/_colorize_result_prepare.m4	(revision 63072)
@@ -21,7 +21,7 @@ AC_DEFUN([_COLORIZE_RESULT_PREPARE], [ https://github.com/ruby/ruby/blob/trunk/tool/m4/_colorize_result_prepare.m4#L21
     AS_REQUIRE_SHELL_FN([colorize_result],
 	[AS_FUNCTION_DESCRIBE([colorize_result], [MSG], [Colorize result])],
         [AS_CASE(["$[]1"],
-            [yes], [AS_ECHO(["${msg_result_yes}$[]1${msg_reset}"])],
-            [no], [AS_ECHO(["${msg_result_no}$[]1${msg_reset}"])],
-            [AS_ECHO(["${msg_result_other}$[]1${msg_reset}"])])])
+            [yes], [_AS_ECHO([${msg_result_yes}$[]1${msg_reset}])],
+            [no], [_AS_ECHO([${msg_result_no}$[]1${msg_reset}])],
+            [_AS_ECHO([${msg_result_other}$[]1${msg_reset}])])])
 ])dnl
Index: tool/m4/colorize_result.m4
===================================================================
--- tool/m4/colorize_result.m4	(revision 63071)
+++ tool/m4/colorize_result.m4	(revision 63072)
@@ -2,8 +2,8 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/colorize_result.m4#L2
 AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
     AS_LITERAL_IF([$1],
 	[m4_case([$1],
-		[yes], [AS_ECHO(["${msg_result_yes}$1${msg_reset}"])],
-		[no], [AS_ECHO(["${msg_result_no}$1${msg_reset}"])],
-		[AS_ECHO(["${msg_result_other}$1${msg_reset}"])])],
+		[yes], [_AS_ECHO([${msg_result_yes}$1${msg_reset}])],
+		[no], [_AS_ECHO([${msg_result_no}$1${msg_reset}])],
+		[_AS_ECHO([${msg_result_other}$1${msg_reset}])])],
 	[colorize_result "$1"]) dnl
 ])dnl

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]