summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-10-16 19:37:57 +0900
committernagachika <nagachika@ruby-lang.org>2022-10-16 19:37:57 +0900
commitc1129491bbf072862d10caa5b97acaa59437ecf3 (patch)
tree311d3b87ad571f5b9d036ccf301e32ee05f64e30 /common.mk
parent174594cf77bed6c3899af4ef14f6c7d257e6461d (diff)
merge revision(s) 64cff780051adf95a0f1799baddec98ae23e8add:
`Gem.unpack` extracts gems so able to execute Creates simple bin stubs to load the extracted executable files. After only extracted under `gems` directory, the gems are considered installed but the executable scripts are not found. Also the second argument is now the parent of the previous second and third arguments. --- common.mk | 6 ++---- defs/gmake.mk | 3 +-- tool/gem-unpack.rb | 30 +++++++++++++++++++----------- 3 files changed, 22 insertions(+), 17 deletions(-)
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 39b8b727f5..7e97562d77 100644
--- a/common.mk
+++ b/common.mk
@@ -1362,10 +1362,11 @@ extract-gems$(gnumake:yes=-nongnumake): PHONY
-Itool -rgem-unpack -answ \
-e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \
-e 'BEGIN {FileUtils.mkdir_p(s = ".bundle/specifications")}' \
+ -e 'BEGIN {d = ".bundle/gems"}' \
-e 'gem, ver = *$$F' \
-e 'next if !ver or /^#/=~gem' \
-e 'g = "#{gem}-#{ver}"' \
- -e 'File.directory?("#{d}/#{g}") or Gem.unpack("gems/#{g}.gem", d, s)' \
+ -e 'File.directory?("#{d}/#{g}") or Gem.unpack("gems/#{g}.gem", ".bundle")' \
gems/bundled_gems
update-bundled_gems: PHONY