nagachika	2015-12-10 00:21:04 +0900 (Thu, 10 Dec 2015)

  New Revision: 53006

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

  Log:
    merge revision(s) 51808: [Backport #11794]
    
    * common.mk (update-gems): use BASERUBY instead of RUNRUBY.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/common.mk
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 53005)
+++ ruby_2_2/ChangeLog	(revision 53006)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Dec 10 00:19:18 2015  NAKAMURA Usaku  <usa@r...>
+
+	* common.mk (update-gems): use BASERUBY instead of RUNRUBY.
+
 Wed Dec  9 01:49:13 2015  Eric Wong  <e@8...>
 
 	* insns.def (opt_case_dispatch): check Float#=== redefinition
Index: ruby_2_2/common.mk
===================================================================
--- ruby_2_2/common.mk	(revision 53005)
+++ ruby_2_2/common.mk	(revision 53006)
@@ -903,7 +903,7 @@ update-config_files: PHONY https://github.com/ruby/ruby/blob/trunk/ruby_2_2/common.mk#L903
 
 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")' \
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 53005)
+++ ruby_2_2/version.h	(revision 53006)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51808


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