X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=repackage%2FMakefile;h=3f9bafd4bf2a12372d133de6a898c38cb88a561e;hb=94dcbdfafab8ea906fe30564e83971c46358264c;hp=e555f392ea660e44781a5057ebd628913297886c;hpb=86f9a58aa1f153b1fda19459084368fd3f69902d;p=gpl%2Fargeo-tp.git diff --git a/repackage/Makefile b/repackage/Makefile index e555f39..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 @@ -24,7 +26,6 @@ org.argeo.tp \ org.argeo.tp.crypto \ org.argeo.tp.jetty \ org.argeo.tp.utils \ -org.argeo.tp.sql \ org.argeo.tp.jcr \ org.argeo.tp.poi \ org.argeo.tp.gis \ @@ -39,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