diff options
| author | Mat Sadler <[email protected]> | 2023-01-22 22:46:22 -0800 |
|---|---|---|
| committer | git <[email protected]> | 2023-01-30 17:39:47 +0000 |
| commit | b4defea362278a38a4f7c86a86c5c44fff173e8b () | |
| tree | 659ea08fcc52d625f29792dbaf5205213f4b6456 | |
| parent | ca951f671920b64c8275ffccdc680848f60cbede (diff) | |
[rubygems/rubygems] install rust extensions into expected directory nesting
https://.com/rubygems/rubygems/commit/85ea86d348
| -rw-r--r-- | lib/rubygems/ext/cargo_builder.rb | 32 | ||||
| -rw-r--r-- | test/rubygems/test_gem_ext_cargo_builder.rb | 8 | ||||
| -rw-r--r-- | test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock (renamed from test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock) | 0 | ||||
| -rw-r--r-- | test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml (renamed from test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml) | 0 | ||||
| -rw-r--r-- | test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs (renamed from test/rubygems/test_gem_ext_cargo_builder/custom_name/src/lib.rs) | 0 | ||||
| -rw-r--r-- | test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb | 1 |
7 files changed, 33 insertions, 12 deletions
@@ -14,7 +14,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder @profile = :release end - def build(_extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd) require "tempfile" require "fileutils" @@ -43,16 +43,19 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder dlext_path = File.join(File.dirname(dylib_path), dlext_name) FileUtils.cp(dylib_path, dlext_path) # TODO: remove in RubyGems 4 if Gem.install_extension_in_lib && lib_dir - FileUtils.mkdir_p lib_dir - p [dlext_path, lib_dir] - FileUtils.cp_r dlext_path, lib_dir, remove_destination: true end # move to final destination - FileUtils.mkdir_p dest_path - FileUtils.cp_r dlext_path, dest_path, remove_destination: true ensure # clean up intermediary build artifacts FileUtils.rm_rf tmp_dest if tmp_dest @@ -94,6 +97,23 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder ENV.fetch("CARGO", "cargo") end def rb_config_env result = {} RbConfig::CONFIG.each {|k, v| result["RBCONFIG_#{k}"] = v } @@ -32,7 +32,7 @@ class TestGemExtCargoBuilder < Gem::TestCase Dir.chdir @ext do ENV.update(@rust_envs) builder = Gem::Ext::CargoBuilder.new - builder.build nil, @dest_path, output end output = output.join "\n" @@ -58,7 +58,7 @@ class TestGemExtCargoBuilder < Gem::TestCase Dir.chdir @ext do ENV.update(@rust_envs) builder = Gem::Ext::CargoBuilder.new - builder.build nil, @dest_path, output end output = output.join "\n" @@ -83,7 +83,7 @@ class TestGemExtCargoBuilder < Gem::TestCase Dir.chdir @ext do ENV.update(@rust_envs) builder = Gem::Ext::CargoBuilder.new - builder.build nil, @dest_path, [] end end @@ -130,7 +130,7 @@ class TestGemExtCargoBuilder < Gem::TestCase Open3.capture2e(*gem, "install", "--verbose", "--local", built_gem, *ARGV) end - stdout_and_stderr_str, status = Open3.capture2e(env_for_subprocess, *ruby_with_rubygems_in_load_path, "-rcustom_name_ext", "-e", "puts 'Result: ' + CustomName.say_hello") assert status.success?, stdout_and_stderr_str assert_match "Result: Hello world!", stdout_and_stderr_str @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = "custom_name" s.version = "0.1.0" s.summary = "A Rust extension for Ruby" - s.extensions = ["Cargo.toml"] s.authors = ["Ian Ker-Seymer"] - s.files = ["Cargo.toml", "Cargo.lock", "src/lib.rs"] end @@ -0,0 +1 @@ |