1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Simplify how extensions are built

Browse Source 
https://github.com/rubygems/rubygems/commit/0b8faf1e39
This commit is contained in:
David Rodríguez 2022-12-15 23:59:13 +01:00 committed by Hiroshi SHIBATA
parent 5ea4df6a8f
commit e99951edfa
3 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/rubygems/ext/builder.rb
View File

@ -19,7 +19,14 @@ class Gem::Ext::Builder
$1.downcase $1.downcase
end 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") unless File.exist? File.join(make_dir, "Makefile")
raise Gem::InstallError, "Makefile not found" raise Gem::InstallError, "Makefile not found"
end end
@ -35,10 +42,8 @@ class Gem::Ext::Builder
env = [destdir] env = [destdir]
if sitedir env << format("sitearchdir=%s", dest_path)
env << format("sitearchdir=%s", sitedir) env << format("sitelibdir=%s", dest_path)
env << format("sitelibdir=%s", sitedir)
end
targets.each do |target| targets.each do |target|
# Pass DESTDIR via command line to override what's in MAKEFLAGS # Pass DESTDIR via command line to override what's in MAKEFLAGS

35
lib/rubygems/ext/ext_conf_builder.rb
View File

@ -9,15 +9,6 @@
class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd) def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
require "fileutils" 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"] destdir = ENV["DESTDIR"]
@ -39,35 +30,31 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
ENV["DESTDIR"] = nil ENV["DESTDIR"] = nil
make dest_path, results, extension_dir, tmp_dest_relative rel_dest_path = get_relative_path(dest_path, extension_dir)
make rel_dest_path, results, extension_dir
full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
# TODO: remove in RubyGems 4 # TODO: remove in RubyGems 4
if Gem.install_extension_in_lib && lib_dir if Gem.install_extension_in_lib && lib_dir
FileUtils.mkdir_p lib_dir FileUtils.mkdir_p lib_dir
entries = Dir.entries(full_tmp_dest) - %w[. ..] entries = Dir.entries(dest_path) - %w[. ..]
entries = entries.map {|entry| File.join full_tmp_dest, entry } entries = entries.map {|entry| File.join dest_path, entry }
FileUtils.cp_r entries, lib_dir, remove_destination: true FileUtils.cp_r entries, lib_dir, remove_destination: true
end end
FileUtils::Entry_.new(full_tmp_dest).traverse do |ent| make dest_path, results, extension_dir, ["clean"]
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"]
ensure ensure
ENV["DESTDIR"] = destdir ENV["DESTDIR"] = destdir
end end
results results
ensure
FileUtils.rm_rf tmp_dest if tmp_dest
end end
def self.get_relative_path(path, base) def self.get_relative_path(path, base)
path[0..base.length - 1] = "." if path.start_with?(base) path.split("/").zip(base.split("/")).inject(String.new) do |result, (path_component, base_component)|
path next result if path_component == base_component
result.prepend("../") if base_component
result.concat("#{path_component}/") if path_component
result
end
end end
end end

12
test/rubygems/test_gem_ext_builder.rb
View File

@ -48,9 +48,9 @@ install:
results = results.join("\n").b results = results.join("\n").b
assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} clean$/, results) assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} sitearchdir\\=#{@dest_path} sitelibdir\\=#{@dest_path} clean$/, results)
assert_match(/DESTDIR\\=#{ENV["DESTDIR"]}$/, results) assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} sitearchdir\\=#{@dest_path} sitelibdir\\=#{@dest_path}$/, results)
assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} install$/, results) assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} sitearchdir\\=#{@dest_path} sitelibdir\\=#{@dest_path} install/, results)
unless results.include?("nmake") unless results.include?("nmake")
assert_match(/^clean: destination$/, results) assert_match(/^clean: destination$/, results)
@ -77,9 +77,9 @@ install:
results = results.join("\n").b results = results.join("\n").b
assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} clean$/, results) assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} sitearchdir\\=#{@dest_path} sitelibdir\\=#{@dest_path} clean$/, results)
assert_match(/DESTDIR\\=#{ENV["DESTDIR"]}$/, results) assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} sitearchdir\\=#{@dest_path} sitelibdir\\=#{@dest_path}$/, results)
assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} install$/, results) assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} sitearchdir\\=#{@dest_path} sitelibdir\\=#{@dest_path} install$/, results)
end end
def test_custom_make_with_options def test_custom_make_with_options