ruby-changes:27340
From: drbrain <ko1@a...>
Date: Sat, 23 Feb 2013 06:09:23 +0900 (JST)
Subject: [ruby-changes:27340] drbrain:r39392 (ruby_2_0_0): Merge trunk revision: 39366
drbrain 2013-02-23 06:09:09 +0900 (Sat, 23 Feb 2013) New Revision: 39392 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39392 Log: Merge trunk revision: 39366 * lib/rubygems/installer.rb (build_extensions): Create extension install destination before building extension. Patch by Kenta Murata. [ruby-trunk - Bug #7897] * test/rubygems/test_gem_installer.rb: Test for the above. Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/lib/rubygems/installer.rb branches/ruby_2_0_0/test/rubygems/test_gem_installer.rb Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 39391) +++ ruby_2_0_0/ChangeLog (revision 39392) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Sat Feb 23 06:07:04 2013 Eric Hodel <drbrain@s...> + + * lib/rubygems/installer.rb (build_extensions): Create extension + install destination before building extension. Patch by Kenta Murata. + [ruby-trunk - Bug #7897] + * test/rubygems/test_gem_installer.rb: Test for the above. + Sat Feb 23 04:34:44 2013 Marc-Andre Lafortune <ruby-core@m...> * NEWS: pending_interrupt? is both instance and singleton method Index: ruby_2_0_0/lib/rubygems/installer.rb =================================================================== --- ruby_2_0_0/lib/rubygems/installer.rb (revision 39391) +++ ruby_2_0_0/lib/rubygems/installer.rb (revision 39392) @@ -8,6 +8,7 @@ require 'rubygems/exceptions' https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rubygems/installer.rb#L8 require 'rubygems/package' require 'rubygems/ext' require 'rubygems/user_interaction' +require 'fileutils' ## # The installer installs the files contained in the .gem into the Gem.home. @@ -671,6 +672,8 @@ TEXT https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rubygems/installer.rb#L672 end begin + FileUtils.mkdir_p dest_path + Dir.chdir extension_dir do results = builder.build(extension, gem_dir, dest_path, results, @build_args) Index: ruby_2_0_0/test/rubygems/test_gem_installer.rb =================================================================== --- ruby_2_0_0/test/rubygems/test_gem_installer.rb (revision 39391) +++ ruby_2_0_0/test/rubygems/test_gem_installer.rb (revision 39392) @@ -137,6 +137,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#L137 path = File.join @spec.gem_dir, "extconf_args" assert_equal args.inspect, File.read(path).strip + assert File.directory? File.join(@spec.gem_dir, 'lib') end def test_check_executable_overwrite Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r39366 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/