X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi.mk;h=85ad3c40e9935264da4acb8f02e9ead797d2dd56;hb=1d38b1c8155f35271cf20217167eb6901df25272;hp=b93e06ca04f9bd0a1b5d96d2ea81fc7ba3ac3417;hpb=6ec1c9218ef46286942a0e02d7dbb47086070dc5;p=cc0%2Fargeo-build.git

diff --git a/osgi.mk b/osgi.mk
index b93e06c..85ad3c4 100644
--- a/osgi.mk
+++ b/osgi.mk
@@ -1,3 +1,5 @@
+ARGEO_BUILD_BASE := $(dir $(lastword $(MAKEFILE_LIST)))
+include $(ARGEO_BUILD_BASE)common.mk
 #
 # Common build routines to be included in Makefiles
 #
@@ -5,52 +7,59 @@
 # SDK_SRC_BASE		the base of the source code, typically the root of the cloned git repository
 # SDK_BUILD_BASE	the base of the output
 # JAVA_HOME			the base of the JDK used to build
-A2_OUTPUT := $(SDK_BUILD_BASE)/a2
+A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 JVM ?= $(JAVA_HOME)/bin/java
 JAVADOC ?= $(JAVA_HOME)/bin/javadoc
 
-# The following variables should be declared in the Makefile:
-# BUNDLES			the space-separated list of bundles to be built
-# A2_CATEGORY		the a2 category the bundles will belong to
-#
-# The following variables have default values which can be overriden in the Makefile
+# 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
+
+# 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
 # A2_BASE			the space-separated directories where already built a2 categories can be found
 DEP_CATEGORIES ?=
 JAVADOC_PACKAGES ?=
-A2_BASE ?= $(A2_OUTPUT)
+A2_BASE ?=/usr/share/a2 /usr/local/share/a2 $(A2_OUTPUT)
 
-ECJ_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.3.31.jar
-BNDLIB_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/biz.aQute.bndlib.5.3.jar
-SLF4J_API_JAR ?= $(A2_BASE)/org.argeo.tp/org.slf4j.api.1.7.jar
-ARGEO_MAKE := $(JVM) -cp $(ECJ_JAR):$(BNDLIB_JAR):$(SLF4J_API_JAR) $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Make.java
-#ARGEO_MAKE = $(JVM) -cp $(ECJ_JAR):$(BNDLIB_JAR):$(SLF4J_API_JAR):$(BUILD_BASE)/bin org/argeo/build/Make
+# Third-party libraries
+LOGGER_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar)))
+ECJ_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.$(ECJ_BRANCH).jar)))
+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
 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) 
 
-## Needed in order to be able to expand $$ variables
+# Needed in order to be able to expand $$ variables
 .SECONDEXPANSION:
 .PHONY: osgi manifests javadoc
 
-osgi: $(BUILD_BASE)/built
-
-javadoc: $(BUILD_BASE)/built
-	$(JAVADOC) -quiet -Xmaxwarns 1 -d $(BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES)
+osgi: $(BUILD_BASE)/built $(MANIFESTS)
 
 # 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) --category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD)
-	touch $(BUILD_BASE)/built 
+	$(ARGEO_MAKE) \
+	 all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) \
+	 --category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD)
+	@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)/,,$*)
+	$(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,15 +67,21 @@ $(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path
 	@touch $@
 
 # Local manifests
-manifests : osgi
-	@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;)
+%/META-INF/MANIFEST.MF : $(BUILD_BASE)/%/META-INF/MANIFEST.MF
+ifneq ($(NO_MANIFEST_COPY),true)
+	@mkdir -p $*/META-INF
+	@cp $< $@
+endif
+
+clean:
+	rm -rf $(BUILD_BASE)
 
-# Local build of the builder, not used as the performance gain is negligible	
-builder: $(BUILD_BASE)/bin/org/argeo/build/Make.class
+clean-manifests :
+	@rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);
 
-$(BUILD_BASE)/bin/org/argeo/build/Make.class : $(SDK_SRC_BASE)/sdk/argeo-build/java/org/argeo/build/Make.java
-	$(JVM) -jar $(ECJ_JAR) -cp $(ECJ_JAR):$(BNDLIB_JAR):$(SLF4J_API_JAR) @$(SDK_SRC_BASE)/sdk/argeo-build/ecj.args $(SDK_SRC_BASE)/sdk/argeo-build/src[-d $(BUILD_BASE)/bin]
+# 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)
 
 # Make variables used to replace spaces by a separator, typically in order to generate classpaths
 # for example: CLASSPATH = $(subst $(space),$(pathsep),$(strip $(JARS)))