Centralise repackage in Argeo Build

diff --git a/common.mk b/common.mk
deleted file mode 100644 (file)
index ed63a54..0000000
--- a/common.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
-
-ifneq (,$(wildcard /etc/redhat-release))
-# dnf install slf4j osgi-core osgi-annotation osgi-compendium
-#BND_CLASSPATH=/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/osgi-core/osgi.core.jar:/usr/share/java/osgi-annotation/osgi.annotation.jar:/usr/share/java/osgi-compendium/osgi.cmpn.jar
-BND_CLASSPATH=
-else
-# sudo apt install libslf4j-java libosgi-core-java libosgi-annotation-java libosgi-compendium-java
-BND_CLASSPATH=/usr/share/java/slf4j-api.jar:/usr/share/java/osgi.core.jar:/usr/share/java/osgi.annotation.jar:/usr/share/java/osgi.cmpn.jar
-endif 
-

diff --git a/repackage/Makefile b/repackage/Makefile
index 3f9bafd4bf2a12372d133de6a898c38cb88a561e..62f1c04e940f71c1b6f37fa706062efbd0bee078 100644 (file)
--- 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

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 00cb05eb3acc5b6900320cc672ecd865114612a5..2d0ccb3e6514b8e2555f3e36674b7d59d6826fdb 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 00cb05eb3acc5b6900320cc672ecd865114612a5
+Subproject commit 2d0ccb3e6514b8e2555f3e36674b7d59d6826fdb