diff options
| author | nagachika <nagachika@ruby-lang.org> | 2024-06-02 07:13:25 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2024-06-18 22:50:39 +0900 |
| commit | 56c311aa0b20dee13ab43309ae3386f57f8cb797 (patch) | |
| tree | 6d514dda63b868ddabe09f2a3291e3357c6c18aa | |
| parent | 8e7d5adb4a481e9b4050505ea88cdf64278cacb7 (diff) | |
merge revision(s) 9f708d48f6df37ee9600db9d51b57a156609a13b,0301473fb523c71d8cdc4966971f31f502001185,7f0e26b7f99bf76408569892ce20318501f74729: [Backport #20516]
Clear runtime dependencies if default gems is specified.
The current build system uses runtime dependencies from only
`.bundle` directory. We shouldn't install runtime dependencies
from rubygems.org when `make test-bundled-gems` is invoked.
Fixed dependencies list format
Re-use strscan with ruby repo
| -rw-r--r-- | tool/lib/bundled_gem.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tool/lib/bundled_gem.rb b/tool/lib/bundled_gem.rb index 38c331183d..6633d3e0c4 100644 --- a/tool/lib/bundled_gem.rb +++ b/tool/lib/bundled_gem.rb @@ -6,6 +6,16 @@ require 'rubygems/package' # unpack bundled gem files. module BundledGem + DEFAULT_GEMS_DEPENDENCIES = [ + "net-protocol", # net-ftp + "time", # net-ftp + "singleton", # prime + "ipaddr", # rinda + "forwardable", # prime, rinda + "ruby2_keywords", # drb + "strscan" # rexml + ] + module_function def unpack(file, *rest) @@ -35,6 +45,9 @@ module BundledGem gem_dir = File.join(dir, "gems", target) yield gem_dir spec_dir = spec.extensions.empty? ? "specifications" : File.join("gems", target) + if spec.extensions.empty? + spec.dependencies.reject! {|dep| DEFAULT_GEMS_DEPENDENCIES.include?(dep.name)} + end File.binwrite(File.join(dir, spec_dir, "#{target}.gemspec"), spec.to_ruby) unless spec.extensions.empty? spec.dependencies.clear |