From 673efdceef8ab206b4220dcbf5beb2df3dd2fa66 Mon Sep 17 00:00:00 2001 From: drbrain Date: Sun, 1 Dec 2013 20:52:57 +0000 Subject: * lib/rubygems: Update to RubyGems master baa965b. Notable changes: 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 --- lib/rubygems/ext/ext_conf_builder.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/rubygems/ext/ext_conf_builder.rb') diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index 6e736d8062..84d4609017 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -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 -- cgit v1.2.3