X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=repackage%2FMakefile;h=3b9f86a60bc6cb4e8a45ad97cd3a345c4418a938;hb=62ccf9f33b28bcabd29248a68c9f51a113ee88c7;hp=e555f392ea660e44781a5057ebd628913297886c;hpb=86f9a58aa1f153b1fda19459084368fd3f69902d;p=gpl%2Fargeo-tp.git diff --git a/repackage/Makefile b/repackage/Makefile index e555f39..3b9f86a 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 @@ -39,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 \ $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Repackage.java $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE) touch $(BUILD_BASE)/repackaged