X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=repackage.mk;h=511ad2c13866117b84420e19e2ef85011ed3e785;hb=4d2955f554f19e8f77eae527b5831d533eb8d27f;hp=3e3a96b346c76fcb1319ee02a1a88f901a34cee4;hpb=b901c7cb02244589bdde57c352e5abb7393dd7b5;p=cc0%2Fargeo-build.git

diff --git a/repackage.mk b/repackage.mk
index 3e3a96b..511ad2c 100644
--- a/repackage.mk
+++ b/repackage.mk
@@ -18,16 +18,26 @@ JVM ?= $(JAVA_HOME)/bin/java
 A2_BASE ?=/usr/share/a2 /usr/local/share/a2 $(A2_OUTPUT)
 
 # Third-party libraries
-LOGGER_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar)))
-BNDLIB_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp.sdk/biz.aQute.bndlib.$(BNDLIB_BRANCH).jar)))
+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 
 
+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
@@ -42,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