зеркало из https://github.com/github/ruby.git
[rubygems/rubygems] Now install extension in lib is true
https://github.com/rubygems/rubygems/commit/bbcad80772
This commit is contained in:
Родитель
27501a5509
Коммит
a551d93655
|
@ -47,7 +47,7 @@ class Gem::ConfigFile
|
||||||
DEFAULT_CONCURRENT_DOWNLOADS = 8
|
DEFAULT_CONCURRENT_DOWNLOADS = 8
|
||||||
DEFAULT_CERT_EXPIRATION_LENGTH_DAYS = 365
|
DEFAULT_CERT_EXPIRATION_LENGTH_DAYS = 365
|
||||||
DEFAULT_IPV4_FALLBACK_ENABLED = false
|
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
|
# For Ruby packagers to set configuration defaults. Set in
|
||||||
|
|
|
@ -47,7 +47,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
|
||||||
|
|
||||||
nesting = extension_nesting(extension)
|
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)
|
nested_lib_dir = File.join(lib_dir, nesting)
|
||||||
FileUtils.mkdir_p nested_lib_dir
|
FileUtils.mkdir_p nested_lib_dir
|
||||||
FileUtils.cp_r dlext_path, nested_lib_dir, remove_destination: true
|
FileUtils.cp_r dlext_path, nested_lib_dir, remove_destination: true
|
||||||
|
|
|
@ -43,7 +43,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
||||||
|
|
||||||
full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
|
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
|
FileUtils.mkdir_p lib_dir
|
||||||
entries = Dir.entries(full_tmp_dest) - %w[. ..]
|
entries = Dir.entries(full_tmp_dest) - %w[. ..]
|
||||||
entries = entries.map {|entry| File.join full_tmp_dest, entry }
|
entries = entries.map {|entry| File.join full_tmp_dest, entry }
|
||||||
|
|
|
@ -162,7 +162,7 @@ install:
|
||||||
|
|
||||||
extension_in_lib(false) do
|
extension_in_lib(false) do
|
||||||
@orig_install_extension_in_lib = Gem.configuration.install_extension_in_lib
|
@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"
|
@spec.extensions << "ext/extconf.rb"
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче