Split clone-bundled-gems-src for nmake and other usual makes

Author: nobu

common.mk

@@ -1563,16 +1563,6 @@ extract-gems$(sequential): PHONY
 extract-gems$(sequential): $(HAVE_GIT:yes=clone-bundled-gems-src)
 
 clone-bundled-gems-src: PHONY
-	$(Q) $(BASERUBY) -C "$(srcdir)" \
-	    -Itool/lib -rbundled_gem -answ \
-	    -e 'BEGIN {git = $$git}' \
-	    -e 'gem, _, repo, rev = *$$F' \
-	    -e 'next if !rev or /^#/=~gem' \
-	    -e 'gemdir = "gems/src/#{gem}"' \
-	    -e 'BundledGem.checkout(gemdir, repo, rev, git: git)' \
-	    -e 'BundledGem.dummy_gemspec("#{gemdir}/#{gem}.gemspec")' \
-	    -- -git="$(GIT)" \
-	    gems/bundled_gems
 
 outdate-bundled-gems: PHONY
 	$(Q) $(BASERUBY) $(tooldir)/$@.rb --make="$(MAKE)" --mflags="$(MFLAGS)" \

template/Makefile.in

@@ -601,6 +601,26 @@ gcov:
 lcov:
 	$(Q) $(BASERUBY) $(tooldir)/run-lcov.rb
 
+clone-bundled-gems-src:
+	$(Q) $(MAKEDIRS) "$(srcdir)/gems/src"
+	$(Q) : $(MAKE) && set -e && \
+	sed 's/#.*//;/^ *$$/d' "$(srcdir)/gems/bundled_gems" | \
+	while read gem _ repo rev; do \
+	    if [ ! -e "$(srcdir)/gems/src/$$gem/.git" ]; then \
+		echo Cloning $$repo; \
+		$(GIT) -C "$(srcdir)" clone --depth=1 --no-tags $$repo gems/src/$$gem; \
+	    fi; \
+	    if [ "$${rev:+`$(GIT) -C "$(srcdir)/gems/src/$$gem" rev-parse HEAD`}" != "$$rev" ]; then \
+		echo Update $$gem to $$rev; \
+		$(GIT) -C "$(srcdir)/gems/src/$$gem" fetch origin $$rev; \
+		$(GIT) -C "$(srcdir)/gems/src/$$gem" checkout --detach $$rev; \
+	    fi; \
+	    if [ ! -e "$(srcdir)/gems/src/$$gem/$$gem.gemspec" ]; then \
+		$(BASERUBY) -C "$(srcdir)" -I$(tooldir)/lib -rbundled_gem \
+		    -e 'BundledGem.dummy_gemspec(*ARGV)' gems/src/$$gem/$$gem.gemspec; \
+	    fi; \
+	done
+
 update-benchmark-driver:
 	$(Q) $(tooldir)/git-refresh -C $(srcdir)/benchmark $(Q1:0=-q) \
 		--branch $(BENCHMARK_DRIVER_GIT_REF) \

win32/Makefile.sub

@@ -1325,6 +1325,28 @@ clean-enc distclean-enc realclean-enc:
 	-$(Q)$(MAKE) $(MAKE_ENC) $(@:-enc=)
 !endif
 
+clone-bundled-gems-src:
+	$(Q) if not exist "$(srcdir:/=\)\gems\src" md "$(srcdir:/=\)\gems\src"
+	$(Q) prompt $$e[96m$$g$$e[m$$s & \
+	for /f "usebackq eol=# tokens=1,3,4" %G in ("$(srcdir:/=\)\gems\bundled_gems") do $(Q)( \
+	    (if not exist "$(srcdir:/=\)\gems\src\%G\.git" ( \
+		echo Cloning %H && \
+		$(GIT) -C "$(srcdir)" clone --depth=1 --no-tags %H gems/src/%G \
+	    )) && \
+	    ((if not "%I" == "" \
+		for /f %K in ('$(GIT) -C "$(srcdir)/gems/src/%G" rev-parse HEAD') do \
+		    $(Q)if not "%I" == "%K" color 00) || ( \
+		echo Update %G to %I && \
+		$(GIT) -C "$(srcdir)/gems/src/%G" fetch origin %I && \
+		$(GIT) -C "$(srcdir)/gems/src/%G" checkout --detach %I \
+	    )) && \
+	    (if not exist "$(srcdir:/=\)\gems\src\%G\%G.gemspec" ( \
+		echo Generate %G.gemspec && \
+		$(BASERUBY) -C "$(srcdir)" -Itool/lib -rbundled_gem \
+		    -e "BundledGem.dummy_gemspec(ARGV[0])" gems/src/%G/%G.gemspec \
+	    )) \
+	)
+
 $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 		@$(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/resource.rb \
 			-ruby_name=$(RUBY_INSTALL_NAME) \