kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Move to tool/lib/bundled_gem.rb

Browse source
This commit is contained in:
Nobuyoshi Nakada 2022-07-31 00:04:16 +09:00
parent 41516b3541
commit 44a0a66559
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
Notes: git 2022-08-05 13:00:56 +09:00
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common.mk
View file

@ -1361,16 +1361,16 @@ update-gems$(gnumake:yes=-sequential): PHONY
extract-gems$(gnumake:yes=-sequential): PHONY extract-gems$(gnumake:yes=-sequential): PHONY
$(ECHO) Extracting bundled gem files... $(ECHO) Extracting bundled gem files...
$(Q) $(BASERUBY) -C "$(srcdir)" \ $(Q) $(BASERUBY) -C "$(srcdir)" \
-Itool -rfileutils -rgem-unpack -answ \ -Itool/lib -rfileutils -rbundled_gem -answ \
-e 'BEGIN {d = ".bundle/gems"}' \ -e 'BEGIN {d = ".bundle/gems"}' \
-e 'gem, ver, _, rev = *$$F' \ -e 'gem, ver, _, rev = *$$F' \
-e 'next if !ver or /^#/=~gem' \ -e 'next if !ver or /^#/=~gem' \
-e 'g = "#{gem}-#{ver}"' \ -e 'g = "#{gem}-#{ver}"' \
-e 'if File.directory?("#{d}/#{g}")' \ -e 'if File.directory?("#{d}/#{g}")' \
-e 'elsif rev and File.exist?(gs = "gems/src/#{gem}/#{gem}.gemspec")' \ -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 'else' \
-e 'Gem.unpack("gems/#{g}.gem", ".bundle")' \ -e 'BundledGem.unpack("gems/#{g}.gem", ".bundle")' \
-e 'end' \ -e 'end' \
gems/bundled_gems gems/bundled_gems

4
defs/gmake.mk
View file

@ -300,8 +300,8 @@ extract-gems: | $(patsubst %,.bundle/gems/%,$(bundled-gems))
.bundle/gems/%: gems/%.gem | .bundle/gems .bundle/gems/%: gems/%.gem | .bundle/gems
$(ECHO) Extracting bundle gem $*... $(ECHO) Extracting bundle gem $*...
$(Q) $(BASERUBY) -C "$(srcdir)" \ $(Q) $(BASERUBY) -C "$(srcdir)" \
-Itool -rgem-unpack \ -Itool/lib -rbundled_gem \
-e 'Gem.unpack("gems/$(@F).gem", ".bundle")' -e 'BundledGem.unpack("gems/$(@F).gem", ".bundle")'
$(srcdir)/.bundle/gems: $(srcdir)/.bundle/gems:
$(MAKEDIRS) $@ $(MAKEDIRS) $@

4
tool/gem-unpack.rb → tool/lib/bundled_gem.rb
View file

@ -5,7 +5,9 @@ require 'rubygems/package'
# This library is used by "make extract-gems" to # This library is used by "make extract-gems" to
# unpack bundled gem files. # unpack bundled gem files.
class << Gem module BundledGem
module_function
def unpack(file, *rest) def unpack(file, *rest)
pkg = Gem::Package.new(file) pkg = Gem::Package.new(file)
prepare_test(pkg.spec, *rest) {|dir| pkg.extract_files(dir)} prepare_test(pkg.spec, *rest) {|dir| pkg.extract_files(dir)}