X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi.mk;h=170502cc07499fed9da1be810e828f408cb985f1;hb=9958f9a74edcce1f422207304137ab686ab5d9ff;hp=ad772336afe5df5a0914fb52f66827f1d31da38d;hpb=7d19aef426a026deea2b2f41d2b5f87bce948798;p=cc0%2Fargeo-build.git

diff --git a/osgi.mk b/osgi.mk
index ad77233..170502c 100644
--- a/osgi.mk
+++ b/osgi.mk
@@ -2,16 +2,15 @@ ARGEO_BUILD_BASE := $(dir $(lastword $(MAKEFILE_LIST)))
 include $(ARGEO_BUILD_BASE)common.mk
 
 # The following variables should be declared in the including Makefile:
-# BUNDLES			the space-separated list of bundles to build
-# A2_CATEGORY		the (single) a2 category the bundles will belong to
+# BUNDLES           the space-separated list of bundles to build
+# A2_CATEGORY       the (single) a2 category the bundles will belong to
 
 # 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
+# SOURCE_BUNDLES    sources will be packaged separately in Eclipse-compatible source bundles
 
 # The following variables have default values which can be overriden
-# DEP_CATEGORIES	the a2 categories the compilation depends on
-# JAVADOC_PACKAGES	the space-separated list of packages for which javadoc will be generated
+# DEP_CATEGORIES    the a2 categories the compilation depends on
+# JAVADOC_PACKAGES  the space-separated list of packages for which javadoc will be generated
 # NATIVE_PACKAGES   the space-separated list of JNI packages (directories)
 DEP_CATEGORIES ?=
 JAVADOC_PACKAGES ?=
@@ -26,9 +25,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) 
@@ -62,12 +61,15 @@ $(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);
@@ -80,12 +82,14 @@ osgi-clean: jni-clean
 osgi-install: jni-install
 	$(ARGEO_MAKE) \
 	 install --category $(A2_CATEGORY) --bundles $(BUNDLES) \
-	 --target $(A2_INSTALL_TARGET)
+	 --target $(A2_INSTALL_TARGET) \
+	 --os $(TARGET_OS) --target-native $(A2_NATIVE_INSTALL_TARGET)
 
 osgi-uninstall: jni-uninstall
 	$(ARGEO_MAKE) \
 	 uninstall --category $(A2_CATEGORY) --bundles $(BUNDLES) \
-	 --target $(A2_INSTALL_TARGET)
+	 --target $(A2_INSTALL_TARGET) \
+	 --os $(TARGET_OS) --target-native $(A2_NATIVE_INSTALL_TARGET)
 
 jni-all: 
 	$(foreach dir, $(JNIDIRS), $(MAKE) -C $(dir) all;)
@@ -103,10 +107,4 @@ jni-uninstall:
 javadoc: $(BUILD_BASE)/built
 	$(JAVADOC) -noindex -quiet -Xmaxwarns 1 -d $(BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES)
 
-# Make variables used to replace spaces by a separator, typically in order to generate classpaths
-# for example: CLASSPATH = $(subst $(space),$(pathsep),$(strip $(JARS)))
-null  :=
-space := $(null) #
-pathsep := :
-
 .PHONY: osgi manifests javadoc osgi-all osgi-clean osgi-install osgi-uninstall jni-all jni-clean jni-install jni-uninstall