diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 15:10:54 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 15:10:54 +0000 |
| commit | fdd8cf9762ec940542f5eb3ae19ebdf81afacc0d (patch) | |
| tree | 7b8915413c7bac1eb20ccd2401ddea93fde9c398 | |
| parent | cce82740b5b7f814196ddd2ad78242d02ce2e11c (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rwxr-xr-x | tool/ifchange | 6 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 16 insertions, 8 deletions
@@ -1,3 +1,11 @@ +Sat Apr 23 00:02:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * doc/regexp.rdoc (comments): [DOC] terminators cannot appear in diff --git a/configure.in b/configure.in index 1d083ea0a3..f20871e729 100644 --- a/configure.in +++ b/configure.in @@ -748,7 +748,7 @@ RUBY_WERROR_FLAG([ 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 ( 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 diff --git a/tool/ifchange b/tool/ifchange index 7779b28a63..08aaba570c 100755 --- a/tool/ifchange +++ b/tool/ifchange @@ -40,7 +40,7 @@ target="$1" 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" = auto -a -t 1 \) ]; then 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" @@ -1,10 +1,10 @@ #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" |