From b28cb4fa85e141970457a2e9f9411d55a2e13bf6 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 17 Mar 2013 14:27:00 +0000
Subject: [PATCH] merge revision(s) 39579: [Backport #7991]

	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
	  fix for unusal cases again.  install to a temporary directory once
	  and move instaled files to the destination directory, if it is same
	  as the current directory.  [Bug #7698]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                            |  7 +++++++
 lib/rubygems/ext/ext_conf_builder.rb | 30 +++++++++++-----------------
 test/rubygems/test_gem_installer.rb  | 11 ++++++++++
 version.h                            |  2 +-
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09e4f63d50..69b8c2c89a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Mar 17 23:26:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  fix for unusal cases again.  install to a temporary directory once
+	  and move instaled files to the destination directory, if it is same
+	  as the current directory.  [Bug #7698]
+
 Sun Mar 17 23:22:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* 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 7babf409a0..2977cf0207 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -10,26 +10,14 @@ require 'fileutils'
 require 'tempfile'
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
-
-  def self.hack_for_obsolete_style_gems(directory)
-    return unless directory and File.identical?(directory, ".")
-    mf = Gem.read_binary 'Makefile'
-    changed = false
-    changed |= mf.gsub!(/^(install-rb-default:)(.*)/) {
-      "#$1#{$2.gsub(/(?:^|\s+)\$\(RUBY(?:ARCH|LIB)DIR\)\/\S+(?=\s|$)/, '')}"
-    }
-    changed |= mf.gsub!(/^(install-so:.*DLLIB.*\n)((?:\t.*\n)+)/) {
-      "#$1#{$2.gsub(/.*INSTALL.*DLLIB.*\n/, '')}"
-    }
-    if changed
-      File.open('Makefile', 'wb') {|f| f.print mf}
-    end
-  end
+  FileEntry = FileUtils::Entry_ # :nodoc:
 
   def self.build(extension, directory, dest_path, results, args=[])
+    tmp_dest = (Dir.mktmpdir(".gem.", ".") if File.identical?(dest_path, "."))
+
     siteconf = Tempfile.open(%w"siteconf .rb", ".") do |f|
       f.puts "require 'rbconfig'"
-      f.puts "dest_path = #{dest_path.dump}"
+      f.puts "dest_path = #{(tmp_dest || dest_path).dump}"
       %w[sitearchdir sitelibdir].each do |dir|
         f.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
         f.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
@@ -43,14 +31,20 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
     run cmd, results
 
-    hack_for_obsolete_style_gems directory
-
     make dest_path, results
 
+    if tmp_dest
+      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
+    end
+
     results
   ensure
     ENV["RUBYOPT"] = rubyopt
     siteconf.close(true) if siteconf
+    FileUtils.rm_rf tmp_dest if tmp_dest
   end
 
 end
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index 1ef68888a3..60c450957d 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -1001,7 +1001,17 @@ load Gem.bin_path('a', 'executable', version)
       RUBY
     end
 
+    Dir.mkdir(File.join("lib", @spec.name))
+    rb2 = File.join("lib", @spec.name, "#{@spec.name}.rb")
+    @spec.files << rb2
+    write_file File.join(@tempdir, rb2) do |io|
+      io.write <<-RUBY
+        # #{@spec.name}/#{@spec.name}.rb
+      RUBY
+    end
+
     assert !File.exist?(File.join(@spec.gem_dir, rb))
+    assert !File.exist?(File.join(@spec.gem_dir, rb2))
     use_ui @ui do
       path = Gem::Package.build @spec
 
@@ -1009,6 +1019,7 @@ load Gem.bin_path('a', 'executable', version)
       @installer.install
     end
     assert File.exist?(File.join(@spec.gem_dir, rb))
+    assert File.exist?(File.join(@spec.gem_dir, rb2))
   end
 
   def test_install_extension_flat
diff --git a/version.h b/version.h
index 4a4c9b2c25..ebeb0174d6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-17"
-#define RUBY_PATCHLEVEL 61
+#define RUBY_PATCHLEVEL 62
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3