1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Share extracted bundled gems with gems for bundler

Browse Source 
Extract bundled gems under ".bundle/gems" and get rid of
duplication which cause constant redefinition warnings at
`test-all` after `extract-gems` and `test-bundler`.
This commit is contained in:
Nobuyoshi Nakada 2020-02-23 17:59:38 +09:00
parent a504535dd4
commit 55bf0ef1aa
Notes: git 2020-02-25 20:41:00 +09:00 
Merged: https://github.com/ruby/ruby/pull/2922
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common.mk
View File

@ -1290,11 +1290,12 @@ update-gems: PHONY
extract-gems: PHONY extract-gems: PHONY
$(ECHO) Extracting bundled gem files... $(ECHO) Extracting bundled gem files...
$(Q) $(RUNRUBY) -C "$(srcdir)/gems" \ $(Q) $(RUNRUBY) -C "$(srcdir)" \
-I../tool -rgem-unpack -answ \ -Itool -rgem-unpack -answ \
-e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \
-e 'gem, ver = *$$F' \ -e 'gem, ver = *$$F' \
-e 'Gem.unpack("#{gem}-#{ver}.gem")' \ -e 'Gem.unpack("gems/#{gem}-#{ver}.gem", d)' \
bundled_gems gems/bundled_gems
update-bundled_gems: PHONY update-bundled_gems: PHONY
$(Q) $(RUNRUBY) -rrubygems \ $(Q) $(RUNRUBY) -rrubygems \

9
tool/rbinstall.rb
View File

@ -878,11 +878,14 @@ install?(:ext, :comm, :gem, :'bundled-gems') do
} }
gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}"
extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
dirs = Gem::Util.glob_files_in_dir "*/", "#{srcdir}/gems" File.foreach("#{srcdir}/gems/bundled_gems") do |name|
Gem::Specification.each_gemspec(dirs) do |path| next unless /^(\S+)\s+(S+).*/ =~ name
gem_name = "#$1-#$2"
path = "#{srcdir}/.bundle/gems/#{gem_name}/#$1.gemspec"
next unless File.exist?(path)
spec = load_gemspec(path) spec = load_gemspec(path)
next unless spec.platform == Gem::Platform::RUBY next unless spec.platform == Gem::Platform::RUBY
next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] next unless spec.full_name == gem_name
spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
spec.extensions[0] ||= "-" spec.extensions[0] ||= "-"