nagachika	2013-03-17 23:20:55 +0900 (Sun, 17 Mar 2013)

  New Revision: 39789

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

  Log:
    merge revision(s) 39559: [Backport #7991]
    
    * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
      use RUBYOPT instead of -r option, and revert some tests.  [Bug #7698]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb
    branches/ruby_2_0_0/test/rubygems/test_gem_ext_ext_conf_builder.rb
    branches/ruby_2_0_0/test/rubygems/test_gem_installer.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb
===================================================================
--- ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb	(revision 39788)
+++ ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb	(revision 39789)
@@ -22,7 +22,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb#L22
       f
     end
 
-    cmd = [Gem.ruby, "-r#{siteconf.path}", File.basename(extension), *args].join ' '
+    rubyopt = ENV["RUBYOPT"]
+    ENV["RUBYOPT"] = ["-r#{siteconf.path}", rubyopt].compact.join(' ')
+    cmd = [Gem.ruby, File.basename(extension), *args].join ' '
 
     run cmd, results
 
@@ -30,6 +32,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb#L32
 
     results
   ensure
+    ENV["RUBYOPT"] = rubyopt
     siteconf.close(true) if siteconf
   end
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39788)
+++ ruby_2_0_0/version.h	(revision 39789)
@@ -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-17"
-#define RUBY_PATCHLEVEL 59
+#define RUBY_PATCHLEVEL 60
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/test/rubygems/test_gem_ext_ext_conf_builder.rb
===================================================================
--- ruby_2_0_0/test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 39788)
+++ ruby_2_0_0/test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 39789)
@@ -30,7 +30,7 @@ class TestGemExtExtConfBuilder < Gem::Te https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/rubygems/test_gem_ext_ext_conf_builder.rb#L30
       Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
     end
 
-    assert_match(/^#{Gem.ruby} .*extconf.rb/, output[0])
+    assert_match(/^#{Gem.ruby} extconf.rb/, output[0])
     assert_equal "creating Makefile\n", output[1]
     case RUBY_PLATFORM
     when /mswin/ then
@@ -107,10 +107,10 @@ class TestGemExtExtConfBuilder < Gem::Te https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/rubygems/test_gem_ext_ext_conf_builder.rb#L107
 
     assert_match(/\Aextconf failed:
 
-#{Gem.ruby} .*extconf.rb.*
+#{Gem.ruby} extconf.rb.*
 checking for main\(\) in .*?nonexistent/m, error.message)
 
-    assert_match(/^#{Gem.ruby} .*extconf.rb/, output[0])
+    assert_equal("#{Gem.ruby} extconf.rb", output[0])
   end
 
   def test_class_make
Index: ruby_2_0_0/test/rubygems/test_gem_installer.rb
===================================================================
--- ruby_2_0_0/test/rubygems/test_gem_installer.rb	(revision 39788)
+++ ruby_2_0_0/test/rubygems/test_gem_installer.rb	(revision 39789)
@@ -81,7 +81,7 @@ load Gem.bin_path('a', 'executable', ver https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/rubygems/test_gem_installer.rb#L81
 
     gem_make_out = File.join @gemhome, 'gems', @spec.full_name, 'gem_make.out'
 
-    assert_match %r%#{Regexp.escape Gem.ruby} .*extconf\.rb%,
+    assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%,
                  File.read(gem_make_out)
     assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
                  File.read(gem_make_out)

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


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