From a551d936557741fef836961e57b6984a7a282a3e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 10 Mar 2023 12:57:54 +0900 Subject: [PATCH] [rubygems/rubygems] Now install extension in lib is true https://github.com/rubygems/rubygems/commit/bbcad80772 --- lib/rubygems/config_file.rb | 2 +- lib/rubygems/ext/cargo_builder.rb | 2 +- lib/rubygems/ext/ext_conf_builder.rb | 2 +- test/rubygems/test_gem_ext_builder.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb index d61b8cb5cea8a9..886bd6695329d5 100644 --- a/lib/rubygems/config_file.rb +++ b/lib/rubygems/config_file.rb @@ -47,7 +47,7 @@ class Gem::ConfigFile DEFAULT_CONCURRENT_DOWNLOADS = 8 DEFAULT_CERT_EXPIRATION_LENGTH_DAYS = 365 DEFAULT_IPV4_FALLBACK_ENABLED = false - DEFAULT_INSTALL_EXTENSION_IN_LIB = false + DEFAULT_INSTALL_EXTENSION_IN_LIB = true ## # For Ruby packagers to set configuration defaults. Set in diff --git a/lib/rubygems/ext/cargo_builder.rb b/lib/rubygems/ext/cargo_builder.rb index 3e5f398c2d9bfe..c4feb267982cca 100644 --- a/lib/rubygems/ext/cargo_builder.rb +++ b/lib/rubygems/ext/cargo_builder.rb @@ -47,7 +47,7 @@ def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = D nesting = extension_nesting(extension) - if !Gem.configuration.install_extension_in_lib && lib_dir + if Gem.configuration.install_extension_in_lib && lib_dir nested_lib_dir = File.join(lib_dir, nesting) FileUtils.mkdir_p nested_lib_dir FileUtils.cp_r dlext_path, nested_lib_dir, remove_destination: true diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index 0b75a010db0c87..de487484dfe201 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -43,7 +43,7 @@ def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_di full_tmp_dest = File.join(extension_dir, tmp_dest_relative) - if !Gem.configuration.install_extension_in_lib && lib_dir + if Gem.configuration.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 } diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index 7c5556862bbdea..d5812da2aafe53 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -162,7 +162,7 @@ def test_build_extensions_install_ext_only extension_in_lib(false) do @orig_install_extension_in_lib = Gem.configuration.install_extension_in_lib - Gem.configuration.install_extension_in_lib = true + Gem.configuration.install_extension_in_lib = false @spec.extensions << "ext/extconf.rb"