X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=repackage.mk;h=5a14bb727bac006f3e887aaf24f6b74d0636e7a5;hb=7896b2e157fd8191aa4e8e8b6bc5c9999a032082;hp=fc296b64cf5937bdf019e3754a3469586a76c65c;hpb=b7eed050d502f2da4dab789d734bd45b80355868;p=cc0%2Fargeo-build.git diff --git a/repackage.mk b/repackage.mk index fc296b6..5a14bb7 100644 --- a/repackage.mk +++ b/repackage.mk @@ -31,18 +31,20 @@ 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 + @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) - $(ARGEO_REPACKAGE) $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE) - touch $(BUILD_BASE)/repackaged + @$(ARGEO_REPACKAGE) $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE) + @touch $(BUILD_BASE)/repackaged $(BUILD_BASE)/%/to-repackage : $$(shell find % -type f ) @rm -rf $(dir $@) @@ -50,5 +52,5 @@ $(BUILD_BASE)/%/to-repackage : $$(shell find % -type f ) @touch $@ clean: - $(foreach category, $(CATEGORIES), rm -rf $(BUILD_BASE)/$(category)) - rm -f $(BUILD_BASE)/repackaged + @$(foreach category, $(CATEGORIES), rm -rf $(BUILD_BASE)/$(category)) + @rm -f $(BUILD_BASE)/repackaged