X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=osgi.mk;h=2d06f566f7f03c258e3bf9a5bd7f3b41a96c0c99;hb=7adb1db5c7613a3ba1b49cb642b33068b30720dc;hp=44338e817c8172a15b04708f7710ab6edb49e1b6;hpb=6cc5b8599410be968a9b5abe94d65bbe78e5d91f;p=cc0%2Fargeo-build.git diff --git a/osgi.mk b/osgi.mk index 44338e8..2d06f56 100644 --- a/osgi.mk +++ b/osgi.mk @@ -33,9 +33,11 @@ ECJ_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.t BNDLIB_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp.sdk/biz.aQute.bndlib.$(BNDLIB_BRANCH).jar))) # Internal variables -ARGEO_MAKE = $(JVM) -cp $(LOGGER_JAR):$(ECJ_JAR):$(BNDLIB_JAR) $(ARGEO_BUILD_BASE)/src/org/argeo/build/Make.java +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) @@ -66,7 +68,7 @@ $(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path # Local manifests %/META-INF/MANIFEST.MF : $(BUILD_BASE)/%/META-INF/MANIFEST.MF -ifneq($(NO_MANIFEST_COPY),"true") +ifneq ($(NO_MANIFEST_COPY),true) @mkdir -p $*/META-INF @cp $< $@ endif