X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=repackage%2FMakefile;h=14008555176aa21ef41a9f093701dfef34c52ee2;hb=0301f5aa84ea0661efa22f83a5f94eac62eac7b9;hp=40aef3e534666a4cb6a9d339b25b6da0ab042efa;hpb=85bea7e0563de54daffca11633d2248060efec85;p=gpl%2Fargeo-tp.git

diff --git a/repackage/Makefile b/repackage/Makefile
index 40aef3e..1400855 100644
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -1,7 +1,7 @@
 include ../sdk.mk
-.PHONY: clean all
+include ../common.mk
 
-all: distribution
+.PHONY: clean all
 
 BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
 
@@ -19,32 +19,42 @@ lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
 lib/linux/aarch64/swt/rcp/org.argeo.tp.swt \
 lib/win32/x86_64/swt/rcp/org.argeo.tp.swt \
 lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt \
+lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench \
 swt/rcp/org.argeo.tp.swt \
 swt/rcp/org.argeo.tp.swt.workbench \
 org.argeo.tp \
-org.argeo.tp.apache \
+org.argeo.tp.crypto \
 org.argeo.tp.jetty \
+org.argeo.tp.utils \
+org.argeo.tp.sql \
 org.argeo.tp.jcr \
-org.argeo.tp.formats \
 org.argeo.tp.poi \
 org.argeo.tp.gis \
 
+TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage) 
+
+BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
+
+all: $(BUILD_BASE)/repackaged 
+
+.SECONDEXPANSION:
+
+$(BUILD_BASE)/repackaged : CATEGORIES_TO_REPACKAGE = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-repackage,, $?))
+$(BUILD_BASE)/repackaged : $(TODOS_REPACKAGE)
+	#$(JVM) -cp \
+	# $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j-api.jar 
+	$(JVM) -cp $(A2_OUTPUT)/org.argeo.tp.build/biz.aQute.bndlib.5.3.jar:$(BND_CLASSPATH) \
+	 $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Repackage.java $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE)
+	touch $(BUILD_BASE)/repackaged
 
-distribution:
-	$(JVM) -cp \
-	 $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j-api.jar:$(BOOTSTRAP_BASE)/org.argeo.slc.api/bin:$(BOOTSTRAP_BASE)/org.argeo.slc.factory/bin \
-	 $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Repackage.java $(A2_OUTPUT) $(CATEGORIES)
+$(BUILD_BASE)/%/to-repackage : $$(shell find % -type f )
+	@rm -rf $(dir $@)
+	@mkdir -p $(dir $@) 
+	@touch $@
 
 clean:
-	rm -rf $(A2_OUTPUT)/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/org.argeo.tp.*
-	rm -rf $(A2_OUTPUT)/*/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/*/org.argeo.tp.*
-	rm -rf $(A2_OUTPUT)/*/*/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/*/*/org.argeo.tp.*
-	rm -rf $(A2_OUTPUT)/*/*/*/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/*/*/*/org.argeo.tp.*
-	rm -rf $(A2_OUTPUT)/*/*/*/*/org.argeo.tp
-	rm -rf $(A2_OUTPUT)/*/*/*/*/org.argeo.tp.*
+	$(foreach category, $(CATEGORIES), rm -rf $(A2_OUTPUT)/$(category))
+	$(foreach category, $(CATEGORIES), rm -rf $(BUILD_BASE)/$(category))
+	rm -f $(BUILD_BASE)/repackaged
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file