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

diff --git a/repackage/Makefile b/repackage/Makefile
index 2985e0d..1400855 100644
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -1,4 +1,6 @@
 include ../sdk.mk
+include ../common.mk
+
 .PHONY: clean all
 
 BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
@@ -17,13 +19,15 @@ 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 \
 
@@ -37,8 +41,9 @@ all: $(BUILD_BASE)/repackaged
 
 $(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 \
+	# $(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