Skip to content

Commit

Permalink
[rubygems/rubygems] Now install extension in lib is true
Browse files Browse the repository at this point in the history
  • Loading branch information
hsbt authored and matzbot committed Feb 20, 2024
1 parent 27501a5 commit a551d93
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/rubygems/config_file.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/rubygems/ext/cargo_builder.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/rubygems/ext/ext_conf_builder.rb
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion test/rubygems/test_gem_ext_builder.rb
Expand Up @@ -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"

Expand Down

0 comments on commit a551d93

Please sign in to comment.