diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-21 16:23:21 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-21 16:23:21 +0900 |
| commit | e9be76dc6937f15be8e6473cf726f395b749a7a7 (patch) | |
| tree | def35bf370563e03c685b3c8827ea17ebe5f6c3c /common.mk | |
| parent | 833076de9bceb34200d1bf21a9f75997fc387b67 (diff) | |
merge revision(s) 44a0a66559ee4a03a84c27feca05e9b1b0f59df8:
Move to tool/lib/bundled_gem.rb
---
common.mk | 6 +++---
defs/gmake.mk | 4 ++--
tool/gem-unpack.rb | 53 -----------------------------------------------
tool/lib/bundled_gem.rb | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 60 insertions(+), 58 deletions(-)
delete mode 100644 tool/gem-unpack.rb
create mode 100644 tool/lib/bundled_gem.rb
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1368,16 +1368,16 @@ update-gems$(gnumake:yes=-sequential): PHONY extract-gems$(gnumake:yes=-sequential): PHONY $(ECHO) Extracting bundled gem files... $(Q) $(RUNRUBY) -C "$(srcdir)" \ - -Itool -rfileutils -rgem-unpack -answ \ + -Itool/lib -rfileutils -rbundled_gem -answ \ -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \ -e 'gem, ver, _, rev = *$$F' \ -e 'next if !ver or /^#/=~gem' \ -e 'g = "#{gem}-#{ver}"' \ -e 'if File.directory?("#{d}/#{g}")' \ -e 'elsif rev and File.exist?(gs = "gems/src/#{gem}/#{gem}.gemspec")' \ - -e 'Gem.copy(gs, ".bundle")' \ + -e 'BundledGem.copy(gs, ".bundle")' \ -e 'else' \ - -e 'Gem.unpack("gems/#{g}.gem", ".bundle")' \ + -e 'BundledGem.unpack("gems/#{g}.gem", ".bundle")' \ -e 'end' \ -e 'FileUtils.rm_rf("#{d}/#{g}/.github")' \ gems/bundled_gems |