X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=repackage.mk;h=511ad2c13866117b84420e19e2ef85011ed3e785;hb=109eef5a2a28f50915650252873f819316da1ac7;hp=b7d54da091585196d7c37a0a24b1e1f5b0c58061;hpb=2d0ccb3e6514b8e2555f3e36674b7d59d6826fdb;p=cc0%2Fargeo-build.git

diff --git a/repackage.mk b/repackage.mk
index b7d54da..511ad2c 100644
--- a/repackage.mk
+++ b/repackage.mk
@@ -1,23 +1,49 @@
+ARGEO_BUILD_BASE := $(dir $(lastword $(MAKEFILE_LIST)))
+include $(ARGEO_BUILD_BASE)common.mk
+#
+# Common repackage routines to be included in Makefiles
+#
+# The following variables are found in the sdk.mk file which is generated by the configure script:
+# SDK_SRC_BASE		the base of the source code, typically the root of the cloned git repository
+# SDK_BUILD_BASE	the base of the output
+# JAVA_HOME			the base of the JDK used to build
 A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE ?= $(A2_OUTPUT)
 JVM ?= $(JAVA_HOME)/bin/java
 
-TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage) 
+# The following variables should be declared in the including Makefile:
+# CATEGORIES		the space-separated list of categories to repackage
+
+# The following variables have default values which can be overriden
+# A2_BASE			the space-separated directories where already built a2 categories can be found
+A2_BASE ?=/usr/share/a2 /usr/local/share/a2 $(A2_OUTPUT)
 
+# Third-party libraries
+LOGGER_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/log/syslogger/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar)))
+BNDLIB_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp.build/biz.aQute.bndlib.$(BNDLIB_BRANCH).jar)))
+
+# Internal variables
+ARGEO_REPACKAGE = $(JVM) -cp $(LOGGER_JAR):$(BNDLIB_JAR) $(ARGEO_BUILD_BASE)src/org/argeo/build/Repackage.java
+TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage) 
 BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
+REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(category))
 
 all: $(BUILD_BASE)/repackaged 
 
-.SECONDEXPANSION:
+install:
+	@$(foreach category, $(CATEGORIES), mkdir -p $(A2_INSTALL_TARGET)/$(category);  cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);)
+	@echo Installed $(CATEGORIES) to $(A2_INSTALL_TARGET)
+
+uninstall:
+	@$(foreach category, $(CATEGORIES), rm -rf $(A2_INSTALL_TARGET)/$(category);)
+	@find $(A2_INSTALL_TARGET) -empty -type d -delete
+	@echo Uninstalled $(CATEGORIES) from $(A2_INSTALL_TARGET)
 
+.SECONDEXPANSION:
 # We use .SECONDEXPANSION and CATEGORIES_TO_REPACKAGE instead of directly CATEGORIES
 # so that we don't repackage a category if it hasn't changed
 $(BUILD_BASE)/repackaged : CATEGORIES_TO_REPACKAGE = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-repackage,, $?))
 $(BUILD_BASE)/repackaged : $(TODOS_REPACKAGE)
-	$(JVM) \
-	 -cp $(A2_BASE)/org.argeo.tp/org.argeo.tp.syslogger.2.3.jar:$(A2_BASE)/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)
+	$(ARGEO_REPACKAGE) $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE)
 	touch $(BUILD_BASE)/repackaged
 
 $(BUILD_BASE)/%/to-repackage : $$(shell find % -type f )
@@ -26,6 +52,5 @@ $(BUILD_BASE)/%/to-repackage : $$(shell find % -type f )
 	@touch $@
 
 clean:
-	$(foreach category, $(CATEGORIES), rm -rf $(A2_OUTPUT)/$(category))
 	$(foreach category, $(CATEGORIES), rm -rf $(BUILD_BASE)/$(category))
 	rm -f $(BUILD_BASE)/repackaged