archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 54657,54660: [Backport #12303]

Browse source 
* 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
This commit is contained in:
nagachika 2016-04-22 15:10:54 +00:00
parent cce82740b5
commit fdd8cf9762
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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

4
configure.in
View file

@ -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

6
tool/ifchange
View file

@ -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"

6
version.h
View file

@ -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"