[rubygems/rubygems] Simplify how extensions are built

https://github.com/rubygems/rubygems/commit/0b8faf1e39

2 files changed, 21 insertions, 29 deletions

diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
index be1ba3031c..cc067c710a 100644
--- a/lib/rubygems/ext/builder.rb
+++ b/lib/rubygems/ext/builder.rb
@@ -19,7 +19,14 @@ class Gem::Ext::Builder
     $1.downcase
   end
 
-  def self.make(dest_path, results, make_dir = Dir.pwd, sitedir = nil, targets = ["clean", "", "install"])
+  def self.make(dest_path, results, make_dir = Dir.pwd, targets_or_sitedir = ["clean", "", "install"], old_targets = ["clean", "", "install"])
+    if !targets_or_sitedir.is_a?(Array)
+      verbose { "sitedir parameter to Gem::Ext::Builder.make is getting ignored. sitearchdir and sitelibdir are now always set to the first argument passed to this method. Please stop passing this parameter" }
+      targets = old_targets
+    else
+      targets = targets_or_sitedir
+    end
+
     unless File.exist? File.join(make_dir, "Makefile")
       raise Gem::InstallError, "Makefile not found"
     end
@@ -35,10 +42,8 @@ class Gem::Ext::Builder
 
     env = [destdir]
 
-    if sitedir
-      env << format("sitearchdir=%s", sitedir)
-      env << format("sitelibdir=%s", sitedir)
-    end
+    env << format("sitearchdir=%s", dest_path)
+    env << format("sitelibdir=%s", dest_path)
 
     targets.each do |target|
       # Pass DESTDIR via command line to override what's in MAKEFLAGS
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index f38fe5947e..3eed37f485 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -9,15 +9,6 @@
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
   def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
     require "fileutils"
-    require "tempfile"
-
-    tmp_dest = Dir.mktmpdir(".gem.", extension_dir)
-
-    # Some versions of `mktmpdir` return absolute paths, which will break make
-    # if the paths contain spaces.
-    #
-    # As such, we convert to a relative path.
-    tmp_dest_relative = get_relative_path(tmp_dest.clone, extension_dir)
 
     destdir = ENV["DESTDIR"]
 
@@ -39,35 +30,31 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
       ENV["DESTDIR"] = nil
 
-      make dest_path, results, extension_dir, tmp_dest_relative
-
-      full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
+      rel_dest_path = get_relative_path(dest_path, extension_dir)
+      make rel_dest_path, results, extension_dir
 
       # TODO: remove in RubyGems 4
       if Gem.install_extension_in_lib && lib_dir
         FileUtils.mkdir_p lib_dir
-        entries = Dir.entries(full_tmp_dest) - %w[. ..]
-        entries = entries.map {|entry| File.join full_tmp_dest, entry }
+        entries = Dir.entries(dest_path) - %w[. ..]
+        entries = entries.map {|entry| File.join dest_path, entry }
         FileUtils.cp_r entries, lib_dir, remove_destination: true
       end
 
-      FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
-        destent = ent.class.new(dest_path, ent.rel)
-        destent.exist? || FileUtils.mv(ent.path, destent.path)
-      end
-
-      make dest_path, results, extension_dir, tmp_dest_relative, ["clean"]
+      make dest_path, results, extension_dir, ["clean"]
     ensure
       ENV["DESTDIR"] = destdir
     end
 
     results
-  ensure
-    FileUtils.rm_rf tmp_dest if tmp_dest
   end
 
   def self.get_relative_path(path, base)
-    path[0..base.length - 1] = "." if path.start_with?(base)
-    path
+    path.split("/").zip(base.split("/")).inject(String.new) do |result, (path_component, base_component)|
+      next result if path_component == base_component
+      result.prepend("../") if base_component
+      result.concat("#{path_component}/") if path_component
+      result
+    end
   end
 end