X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=repackage%2FMakefile;h=3f9bafd4bf2a12372d133de6a898c38cb88a561e;hb=163f5b9f412436d06d047da8998702e92305d5ee;hp=2985e0d1543823373d6fe2518bfa3815231fbef5;hpb=5e96a4a7fd26e752554cdcc179541267fa397126;p=gpl%2Fargeo-tp.git

diff --git a/repackage/Makefile b/repackage/Makefile
index 2985e0d..3f9bafd 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,14 @@ 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.jcr \
-org.argeo.tp.formats \
 org.argeo.tp.poi \
 org.argeo.tp.gis \
 
@@ -37,8 +40,8 @@ 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 \
+	# TODO make it more configurable / centralise in Argeo Build
+	$(JVM) -cp $(A2_OUTPUT)/org.argeo.tp/org.argeo.tp.syslogger.2.3.jar:$(A2_OUTPUT)/org.argeo.tp.sdk/biz.aQute.bndlib.5.3.jar \
 	 $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Repackage.java $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE)
 	touch $(BUILD_BASE)/repackaged