archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* lib/rubygems: Update to RubyGems master baa965b. Notable changes:

Browse source 
Copy directories to lib/ when installing extensions.  This completes
  the fix for [ruby-trunk - Bug #9106]

* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2013-12-01 20:52:57 +00:00
parent 46e44fb628
commit 673efdceef
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/rubygems/ext/ext_conf_builder.rb
View file

@ -43,13 +43,15 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
make dest_path, results
if tmp_dest
FileEntry.new(tmp_dest).traverse do |ent|
# TODO remove in RubyGems 3
if lib_dir then
libent = ent.class.new lib_dir, ent.rel
libent.exist? or ent.copy libent.path
end
# TODO remove in RubyGems 3
if lib_dir then
FileUtils.mkdir_p lib_dir
entries = Dir.entries(tmp_dest) - %w[. ..]
entries = entries.map { |entry| File.join tmp_dest, entry }
FileUtils.cp_r entries, lib_dir
end
FileEntry.new(tmp_dest).traverse do |ent|
destent = ent.class.new(dest_path, ent.rel)
destent.exist? or File.rename(ent.path, destent.path)
end