From d1dda809f03ef88f0148d7283960253d89d91798 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 17 Mar 2023 05:35:13 +0100 Subject: [PATCH] Deactivate MANIFEST targets when copy is disabled --- osgi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osgi.mk b/osgi.mk index 9c5f53a..5ac04b5 100644 --- a/osgi.mk +++ b/osgi.mk @@ -35,7 +35,9 @@ BNDLIB_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.arge # Internal variables ARGEO_MAKE = $(JVM) -cp $(LOGGER_JAR):$(ECJ_JAR):$(BNDLIB_JAR) $(ARGEO_BUILD_BASE)/src/org/argeo/build/Make.java JAVADOC_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src) +ifneq ($(NO_MANIFEST_COPY),true) MANIFESTS = $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF) +endif BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE)) TARGET_BUNDLES = $(abspath $(foreach bundle, $(BUNDLES),$(A2_OUTPUT)/$(shell dirname $(bundle))/$(A2_CATEGORY)/$(shell basename $(bundle)).$(major).$(minor).jar)) TODOS = $(foreach bundle, $(BUNDLES),$(BUILD_BASE)/$(bundle)/to-build) -- 2.30.2