Skip to content

Commit 3b17ff2

Browse files
committed
Reuse fetch-bundled_gems.rb
1 parent f9966b9 commit 3b17ff2

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

common.mk

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,18 +1562,6 @@ extract-gems$(sequential): PHONY
15621562

15631563
extract-gems$(sequential): $(HAVE_GIT:yes=clone-bundled-gems-src)
15641564

1565-
clone-bundled-gems-src: PHONY
1566-
$(Q) $(BASERUBY) -C "$(srcdir)" \
1567-
-Itool/lib -rbundled_gem -answ \
1568-
-e 'BEGIN {git = $$git}' \
1569-
-e 'gem, _, repo, rev = *$$F' \
1570-
-e 'next if !rev or /^#/=~gem' \
1571-
-e 'gemdir = "gems/src/#{gem}"' \
1572-
-e 'BundledGem.checkout(gemdir, repo, rev, git: git)' \
1573-
-e 'BundledGem.dummy_gemspec("#{gemdir}/#{gem}.gemspec")' \
1574-
-- -git="$(GIT)" \
1575-
gems/bundled_gems
1576-
15771565
outdate-bundled-gems: PHONY
15781566
$(Q) $(BASERUBY) $(tooldir)/[email protected] --make="$(MAKE)" --mflags="$(MFLAGS)" \
15791567
--ruby-platform=$(arch) --ruby-version=$(ruby_version) \
@@ -1623,7 +1611,8 @@ yes-install-for-test-bundled-gems: yes-update-default-gemspecs
16231611
"sinatra" "rack" "tilt" "mustermann" "base64" "compact_index" "rack-test" "logger" "kpeg" "tracer"
16241612

16251613
test-bundled-gems-fetch: yes-test-bundled-gems-fetch
1626-
yes-test-bundled-gems-fetch:
1614+
yes-test-bundled-gems-fetch: clone-bundled-gems-src
1615+
clone-bundled-gems-src: PHONY
16271616
$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb BUNDLED_GEMS="$(BUNDLED_GEMS)" src bundled_gems
16281617
no-test-bundled-gems-fetch:
16291618

0 commit comments

Comments
 (0)