From d6a5fe709ec4b04589684074d901b1ec21e812dc Mon Sep 17 00:00:00 2001 From: drbrain Date: Tue, 10 Dec 2013 19:54:19 +0000 Subject: * lib/rubygems: Update to RubyGems master ec8ed22. Notable changes include: * Renamed extension_install_dir to extension_dir (backwards compatible). * Fixed creation of gem.deps.rb.lock file from TestGemRequestSet#test_install_from_gemdeps_install_dir * Fixed a typo and some documentation. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/ext/builder.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/rubygems/ext/builder.rb') diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb index 110576e685..cbae8234a1 100644 --- a/lib/rubygems/ext/builder.rb +++ b/lib/rubygems/ext/builder.rb @@ -186,7 +186,7 @@ EOF say "This could take a while..." end - dest_path = @spec.extension_install_dir + dest_path = @spec.extension_dir FileUtils.rm_f @spec.gem_build_complete_path @@ -205,9 +205,9 @@ EOF # Writes +output+ to gem_make.out in the extension install directory. def write_gem_make_out output # :nodoc: - destination = File.join @spec.extension_install_dir, 'gem_make.out' + destination = File.join @spec.extension_dir, 'gem_make.out' - FileUtils.mkdir_p @spec.extension_install_dir + FileUtils.mkdir_p @spec.extension_dir open destination, 'wb' do |io| io.puts output end -- cgit v1.2.3