nagachika	2013-03-20 23:21:26 +0900 (Wed, 20 Mar 2013)

  New Revision: 39852

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

  Log:
    merge revision(s) 39835: [Backport #8058]
    
    * test/rubygems/test_gem_installer.rb (test_install_extension_flat):
      use ruby in build directory in case ruby is not installed.
      [ruby-core:53265] [Bug #8058]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/rubygems/test_gem_installer.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39851)
+++ ruby_2_0_0/ChangeLog	(revision 39852)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Mar 20 23:21:14 2013  Hiroshi Shirosaki  <h.shirosaki@g...>
+
+	* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
+	  use ruby in build directory in case ruby is not installed.
+	  [ruby-core:53265] [Bug #8058]
+
 Wed Mar 20 23:17:33 2013  NAKAMURA Usaku  <usa@r...>
 
 	* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup):
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39851)
+++ ruby_2_0_0/version.h	(revision 39852)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-20"
-#define RUBY_PATCHLEVEL 85
+#define RUBY_PATCHLEVEL 86
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/test/rubygems/test_gem_installer.rb
===================================================================
--- ruby_2_0_0/test/rubygems/test_gem_installer.rb	(revision 39851)
+++ ruby_2_0_0/test/rubygems/test_gem_installer.rb	(revision 39852)
@@ -1073,6 +1073,7 @@ gem 'other', version https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/rubygems/test_gem_installer.rb#L1073
 
         CONFIG['CC'] = '$(TOUCH) $@ ||'
         CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+        $ruby = '#{Gem.ruby}'
 
         create_makefile("#{@spec.name}")
       RUBY

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39835


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