Support stubbing entry points without exposing the entire classpath

And use this for modello in maven.

1 files changed, 34 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 03a7b36..dd2140a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,22 @@
 top := $(shell pwd)
 
-CAT    = cat
-CP     = cp
-ECHO   = echo
-EXISTS = test -e
-FAIL   = exit 1
-FIND   = find
-GIT    = git
-MKDIRS = mkdir -p
-PATCH  = patch
-RM     = rm -f
-SED    = sed
-SVN    = svn
-TAR    = bsdtar
-TOUCH  = touch
-WGET   = wget
+CAT     = cat
+CP      = cp
+ECHO    = echo
+EXISTS  = test -e
+FAIL    = exit 1
+FIND    = find
+GIT     = git
+INSTALL = install
+JAVA    = java
+MKDIRS  = mkdir -p
+PATCH   = patch
+RM      = rm -f
+SED     = sed
+SVN     = svn
+TAR     = bsdtar
+TOUCH   = touch
+WGET    = wget
 
 all: package
 
@@ -46,6 +48,7 @@ export JAR_DIR := $(shell $(CAT) conf/jardir.txt)
 # Post-processing for conf/sources.mk
 packages := $(filter-out _%,$(variables))
 packages_specific=$(filter $(patsubst rules/%/Makefile,%,$(wildcard rules/*/Makefile)),$(packages))
+packages_stub    =$(foreach package,$(packages),$(if $(filter stub,$(call name2,type,$(package))),$(package)))
 packages_generic =$(filter-out $(packages_specific) $(packages_stub),$(packages))
 
 specs    := $(foreach variable,$(variables),$(if $(findstring |,$($(variable))),$($(variable))))
@@ -87,7 +90,7 @@ build/download/tar/%: .tokens/network
 
 # extract ######################################################################
 
-extract: PHONY $(addprefix build/extract,$(call spec2,file,$(specs)))
+extract: PHONY $(addprefix build/extract,$(call spec2,file,$(call specs_for,git svn tar union)))
 
 # This is a little gross because to get the dependencies right for
 # `git` and `tar`, we need to do a bit more complex processing of
@@ -203,6 +206,21 @@ build/packages/%: RECURSIVE build/workdir/% rules/_generic/Makefile
 	for dep in $(filter-out RECURSIVE,$^); do $(EXISTS) $$dep || { $(RM) -r '$@'; $(FAIL); }; done
 	$(call recurse,$(top)/rules/_generic/Makefile) || { $(RM) -r '$@'; $(FAIL); }
 
+$(addprefix build/packages/,$(packages_stub)): \
+build/packages/%: $(MAKEFILE_LIST)
+	{ \
+		$(ECHO) '#!/bin/sh' && \
+		$(ECHO) 'CLASSPATH=$(call deps2classpath,$^):$${CLASSPATH:+:$${CLASSPATH}}' && \
+		$(ECHO) 'export CLASSPATH' && \
+		$(ECHO) 'exec $(JAVA) $(call name2,extra,$*)' ; \
+	} | $(INSTALL) -Dm755 /dev/stdin '$@/usr/bin/$(call name2,url,$*)' && \
+	{ \
+		$(ECHO) '#!/bin/sh' && \
+		$(ECHO) 'CLASSPATH=$(call deps2classpath,$^):$${CLASSPATH:+:$${CLASSPATH}}' && \
+		$(ECHO) 'printf '%s\n' "$$CLASSPATH"' ; \
+	} | $(INSTALL) -Dm755 /dev/stdin '$@/usr/bin/$(call name2,url,$*)-classpath' || \
+	{ $(RM) -r '$@'; $(FAIL); }
+
 # boilerplate ##################################################################
 
 clean: PHONY