nagachika	2016-04-23 00:10:54 +0900 (Sat, 23 Apr 2016)

  New Revision: 54710

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

  Log:
    merge revision(s) 54657,54660: [Backport #12303]
    
    * configure.in: check if succeeded in creating config.h.
    
    * tool/ifchange: ignore failures when TEST_COLORS unmatched. just
      use the default value if expected name is not contained in it.
      [ruby-core:75046] [Bug #12303]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/configure.in
    branches/ruby_2_3/tool/ifchange
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54709)
+++ ruby_2_3/ChangeLog	(revision 54710)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sat Apr 23 00:02:09 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: check if succeeded in creating config.h.
+
+	* tool/ifchange: ignore failures when TEST_COLORS unmatched. just
+	  use the default value if expected name is not contained in it.
+	  [ruby-core:75046] [Bug #12303]
+
 Fri Apr 22 23:47:05 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* doc/regexp.rdoc (comments): [DOC] terminators cannot appear in
Index: ruby_2_3/tool/ifchange
===================================================================
--- ruby_2_3/tool/ifchange	(revision 54709)
+++ ruby_2_3/tool/ifchange	(revision 54710)
@@ -40,7 +40,7 @@ target="$1" https://github.com/ruby/ruby/blob/trunk/ruby_2_3/tool/ifchange#L40
 temp="$2"
 if [ "$temp" = - ]; then
     temp="tmpdata$$.tmp~"
-    cat > "$temp" || exit $?
+    cat > "$temp"
     trap 'rm -f "$temp"' 0
 fi
 
@@ -50,8 +50,8 @@ if [ "$color" = always -o \( "$color" = https://github.com/ruby/ruby/blob/trunk/ruby_2_3/tool/ifchange#L50
     case "`tput smso 2>/dev/null`" in
 	"$msg_begin"*m)
 	    if [ ${TEST_COLORS:+set} ]; then
-		msg_unchanged=`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`
-		msg_updated=`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`
+		msg_unchanged=`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"` || :
+		msg_updated=`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"` || :
 	    fi
 	    msg_unchanged="${msg_begin}${msg_unchanged:-32;1}m"
 	    msg_updated="${msg_begin}${msg_updated:-31;1}m"
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54709)
+++ ruby_2_3/version.h	(revision 54710)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
-#define RUBY_RELEASE_DATE "2016-04-22"
-#define RUBY_PATCHLEVEL 99
+#define RUBY_RELEASE_DATE "2016-04-23"
+#define RUBY_PATCHLEVEL 100
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 23
 
 #include "ruby/version.h"
 
Index: ruby_2_3/configure.in
===================================================================
--- ruby_2_3/configure.in	(revision 54709)
+++ ruby_2_3/configure.in	(revision 54710)
@@ -748,7 +748,7 @@ RUBY_WERROR_FLAG([ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/configure.in#L748
 	cp ../confdefs.h . &&
 	echo '<?xml?><plist><dict><key>CFBundleIdentifier</key><string></string></dict></plist>' > Info.plist &&
 	:
-    } || AC_MSG_ERROR([faild to make temporary directory])
+    } || AC_MSG_ERROR([failed to make temporary directory])
     AC_TRY_LINK([], [],
 	[AC_MSG_RESULT(yes)],
 	[
@@ -4395,7 +4395,7 @@ guard=INCLUDE_RUBY_CONFIG_H https://github.com/ruby/ruby/blob/trunk/ruby_2_3/configure.in#L4395
 (
   if test "x$CONFIGURE_TTY" = xyes; then color=--color; else color=; fi
   exec ${srcdir}/tool/ifchange $color "${config_h}" -
-)
+) || AC_MSG_ERROR([failed to create ${config_h}])
 tr -d '\015' < largefile.h > confdefs.h
 rm largefile.h
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54657,54660


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