X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=repackage%2FMakefile;h=62f1c04e940f71c1b6f37fa706062efbd0bee078;hb=37a1747ea8265c40d4bb199faff9e4f227ae24d1;hp=3f9bafd4bf2a12372d133de6a898c38cb88a561e;hpb=94dcbdfafab8ea906fe30564e83971c46358264c;p=gpl%2Fargeo-tp.git

diff --git a/repackage/Makefile b/repackage/Makefile
index 3f9bafd..62f1c04 100644
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -1,11 +1,4 @@
 include ../sdk.mk
-include ../common.mk
-
-.PHONY: clean all
-
-BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 
 CATEGORIES=\
 org.argeo.tp.sdk \
@@ -30,29 +23,4 @@ org.argeo.tp.jcr \
 org.argeo.tp.poi \
 org.argeo.tp.gis \
 
-TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage) 
-
-BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
-
-all: $(BUILD_BASE)/repackaged 
-
-.SECONDEXPANSION:
-
-$(BUILD_BASE)/repackaged : CATEGORIES_TO_REPACKAGE = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-repackage,, $?))
-$(BUILD_BASE)/repackaged : $(TODOS_REPACKAGE)
-	# 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
-
-$(BUILD_BASE)/%/to-repackage : $$(shell find % -type f )
-	@rm -rf $(dir $@)
-	@mkdir -p $(dir $@) 
-	@touch $@
-
-clean:
-	$(foreach category, $(CATEGORIES), rm -rf $(A2_OUTPUT)/$(category))
-	$(foreach category, $(CATEGORIES), rm -rf $(BUILD_BASE)/$(category))
-	rm -f $(BUILD_BASE)/repackaged
-
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
+include  $(SDK_SRC_BASE)/sdk/argeo-build/repackage.mk
\ No newline at end of file