Rebuild ECJ and BND

[gpl/argeo-tp.git] / repackage / Makefile

diff --git a/repackage/Makefile b/repackage/Makefile
index c22399c0a1f9a53a6746a799fa2ad677ee91587d..14008555176aa21ef41a9f093701dfef34c52ee2 100644 (file)
--- 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
@@ -21,10 +23,11 @@ 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 \
 
@@ -38,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