X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi.mk;h=4eb1d1201cf1925e2432ffd58042f6a3e296a6a5;hb=49e764ff86e256549b22d16f66369a73cfbc5d3d;hp=0f11835ccb24eddf6a98271771cd078987cdce02;hpb=bababc71de35e8f76c642859299309a86fc53f39;p=cc0%2Fargeo-build.git

diff --git a/osgi.mk b/osgi.mk
index 0f11835..4eb1d12 100644
--- a/osgi.mk
+++ b/osgi.mk
@@ -15,6 +15,10 @@ JAVADOC ?= $(JAVA_HOME)/bin/javadoc
 # 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
+
 # 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
@@ -29,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) 
@@ -41,16 +47,19 @@ TODOS = $(foreach bundle, $(BUNDLES),$(BUILD_BASE)/$(bundle)/to-build)
 .PHONY: osgi manifests javadoc
 
 osgi: $(BUILD_BASE)/built $(MANIFESTS)
-# 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,, $?))
 $(BUILD_BASE)/built : $(TODOS)
-	$(ARGEO_MAKE) all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) \
+	$(ARGEO_MAKE) \
+	 all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) \
 	 --category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD)
-	touch $(BUILD_BASE)/built 
+	@touch $(BUILD_BASE)/built 
+
+$(A2_OUTPUT)/%.$(major).$(minor).jar : $(BUILD_BASE)/$$(subst $(A2_CATEGORY)/,,$$*)/to-build
+	$(ARGEO_MAKE) \
+	 all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) \
+	 --category $(A2_CATEGORY) --bundles $(subst $(A2_CATEGORY)/,,$*)
 
 $(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path '*/MANIFEST.MF' | sed 's/ /\\ /g')
 	@rm -rf $(dir $@)
@@ -58,16 +67,18 @@ $(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path
 	@touch $@
 
 # Local manifests
-$(bundle)/META-INF/MANIFEST.MF : $(BUILD_BASE)/$(bundle)/META-INF/MANIFEST.MF
-	@mkdir@ -p $*
-	cp -v $< $@
+%/META-INF/MANIFEST.MF : $(BUILD_BASE)/%/META-INF/MANIFEST.MF
+ifneq ($(NO_MANIFEST_COPY),true)
+	@mkdir -p $*/META-INF
+	@cp $< $@
+endif
 
 clean-manifests :
 	@rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);
 
 # Javadoc generation
 javadoc: $(BUILD_BASE)/built
-	$(JAVADOC) -quiet -Xmaxwarns 1 -d $(BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES)
+	$(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)))