summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2023-01-18 20:36:31 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2023-01-26 12:50:39 +0900
commit17f5631c6ea118b9ce0e8776dc50c7b1dcdaf596 (patch)
tree93cc91fcdd336690d7d7e3862fa02415f4f4cce1 /common.mk
parent78fcc9847a9db6d42c8c263154ec05903a370b6b (diff)
downloadruby-17f5631c6ea118b9ce0e8776dc50c7b1dcdaf596.tar.gz
[Bug #19340] Fix bundle gems with test revision
Build temporary gem package from cloned repository if test revision is set.
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/common.mk b/common.mk
index abd652fe44..5f8d7e3e88 100644
--- a/common.mk
+++ b/common.mk
@@ -1402,10 +1402,10 @@ extract-gems$(gnumake:yes=-sequential): PHONY
-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 'BundledGem.copy(gs, ".bundle")' \
- -e 'else' \
+ -e 'unless File.directory?("#{d}/#{g}")' \
+ -e 'if rev and File.exist?(gs = "gems/src/#{gem}/#{gem}.gemspec")' \
+ -e 'BundledGem.build(gs, ver, "gems")' \
+ -e 'end' \
-e 'BundledGem.unpack("gems/#{g}.gem", ".bundle")' \
-e 'end' \
gems/bundled_gems