archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 44a0a66559:

Browse source 
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
This commit is contained in:
nagachika 2022-10-21 16:23:21 +09:00
parent 833076de9b
commit e9be76dc69
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common.mk
View file

@ -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

4
defs/gmake.mk
View file

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

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
# unpack bundled gem files.
class << Gem
module BundledGem
module_function
def unpack(file, *rest)
pkg = Gem::Package.new(file)
prepare_test(pkg.spec, *rest) {|dir| pkg.extract_files(dir)}

2
version.h
View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 150
#define RUBY_PATCHLEVEL 151
#define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 10