X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi.mk;fp=osgi.mk;h=334714bf6ad9f6d37ac2c39edfda1ede82e5389e;hb=293a2046966b4a709c60b367db83b6083f80eeaf;hp=170502cc07499fed9da1be810e828f408cb985f1;hpb=9958f9a74edcce1f422207304137ab686ab5d9ff;p=cc0%2Fargeo-build.git diff --git a/osgi.mk b/osgi.mk index 170502c..334714b 100644 --- a/osgi.mk +++ b/osgi.mk @@ -7,6 +7,7 @@ include $(ARGEO_BUILD_BASE)common.mk # The following environment variables can change the behaviour of the build # SOURCE_BUNDLES sources will be packaged separately in Eclipse-compatible source bundles +# NO_MANIFEST_COPY generated MANIFESTs won't be copied to the source tree # The following variables have default values which can be overriden # DEP_CATEGORIES the a2 categories the compilation depends on @@ -25,9 +26,9 @@ BNDLIB_JAR ?= $(firstword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.arg # 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) +ifneq ($(NO_MANIFEST_COPY),true) MANIFESTS = $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF) -#endif +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) @@ -61,15 +62,12 @@ $(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path @mkdir -p $(dir $@) @touch $@ -## DISABLED -# NO_MANIFEST_COPY generated MANIFESTs won't be copied to the source tree - # 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 +endif clean-manifests : @rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);