From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 16 Mar 2023 08:30:12 +0000 (+0100)
Subject: Copy MANIFESTs by default
X-Git-Tag: v2.3.5~92
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=f4c3df094a6f0f02057425d19657e765f88c47dc;p=cc0%2Fargeo-build.git

Copy MANIFESTs by default
---

diff --git a/osgi.mk b/osgi.mk
index 6f92144..1a752b0 100644
--- a/osgi.mk
+++ b/osgi.mk
@@ -40,6 +40,9 @@ TODOS = $(foreach bundle, $(BUNDLES),$(BUILD_BASE)/$(bundle)/to-build)
 .PHONY: osgi manifests javadoc
 
 osgi: $(BUILD_BASE)/built
+# copy MANIFESTs to sources
+	@mkdir -p $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/);
+	@$(foreach bundle, $(BUNDLES), cp -v $(BUILD_BASE)/$(bundle)/META-INF/MANIFEST.MF  $(bundle)/META-INF/MANIFEST.MF;)
 
 # Actual build (compilation + bundle packaging)
 $(BUILD_BASE)/built : BUNDLES_TO_BUILD = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-build,, $?))
@@ -54,9 +57,8 @@ $(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path
 	@touch $@
 
 # Local manifests
-manifests : osgi
-	@mkdir -p $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/);
-	@$(foreach bundle, $(BUNDLES), cp -v $(BUILD_BASE)/$(bundle)/META-INF/MANIFEST.MF  $(bundle)/META-INF/MANIFEST.MF;)
+clean-manifests :
+	@rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);
 
 # Javadoc generation
 javadoc: $(BUILD_BASE)/built