diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-09 15:21:04 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-09 15:21:04 +0000 |
commit | 319a3fa7d1f6e2ee88a23575ee94427115024330 (patch) | |
tree | 24500c2d85bfe004e23eced77615e2a0f873e9b7 | |
parent | 4beed07cf7ec7a2cdff73c9a0675b40a340fa186 (diff) |
merge revision(s) 51808: [Backport #11794]
* common.mk (update-gems): use BASERUBY instead of RUNRUBY.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | common.mk | 2 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Thu Dec 10 00:19:18 2015 NAKAMURA Usaku <usa@ruby-lang.org> + + * common.mk (update-gems): use BASERUBY instead of RUNRUBY. + Wed Dec 9 01:49:13 2015 Eric Wong <e@80x24.org> * insns.def (opt_case_dispatch): check Float#=== redefinition @@ -903,7 +903,7 @@ update-config_files: PHONY update-gems: PHONY $(ECHO) Downloading bundled gem files... - $(Q) $(RUNRUBY) -C "$(srcdir)/gems" \ + $(Q) $(BASERUBY) -C "$(srcdir)/gems" \ -I../tool -rdownloader -answ \ -e 'gem, ver = *$$F' \ -e 'old = Dir.glob("#{gem}-*.gem")' \ @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.4" -#define RUBY_RELEASE_DATE "2015-12-09" -#define RUBY_PATCHLEVEL 224 +#define RUBY_RELEASE_DATE "2015-12-10" +#define RUBY_PATCHLEVEL 225 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 10 #include "ruby/version.h" |