Improve JNI build

[cc0/argeo-build.git] / osgi.mk

diff --git a/osgi.mk b/osgi.mk
index 4eb1d1201cf1925e2432ffd58042f6a3e296a6a5..6e57706314c641fd3b1e7786cad12acd8bbf2fdd 100644 (file)
--- a/osgi.mk
+++ b/osgi.mk
@@ -27,10 +27,11 @@ DEP_CATEGORIES ?=
 JAVADOC_PACKAGES ?=
 A2_BASE ?=/usr/share/a2 /usr/local/share/a2 $(A2_OUTPUT)
 
+# We always use the latest version of the ECJ compiler
+ECJ_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(sort $(wildcard $(base)/org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch.$(ECJ_MAJOR).*.jar))))
 # 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)))
+LOGGER_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/log/syslogger/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar)))
+BNDLIB_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp.build/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
@@ -41,17 +42,22 @@ 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) 
+# Native
+JNIDIRS=$(foreach package, $(NATIVE_PACKAGES), jni/$(package))
 
 # Needed in order to be able to expand $$ variables
 .SECONDEXPANSION:
-.PHONY: osgi manifests javadoc
 
 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 : BUNDLES_TO_BUILD = $(strip $(subst $(abspath $(BUILD_BASE))/,, $(subst to-build,, $?)))
 $(BUILD_BASE)/built : $(TODOS)
-       $(ARGEO_MAKE) \
+       @echo "| A2 category  : $(A2_CATEGORY)"
+       @echo "| Bundles      : $(BUNDLES_TO_BUILD)"
+       @echo "| Dependencies : $(DEP_CATEGORIES)"
+       @echo "| Compiler     : $(notdir $(ECJ_JAR))"
+       @$(ARGEO_MAKE) \
         all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) \
         --category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD)
        @touch $(BUILD_BASE)/built 
@@ -76,6 +82,33 @@ endif
 clean-manifests :
        @rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);
 
+osgi-all: osgi jni-all
+
+osgi-clean: jni-clean
+       rm -rf $(BUILD_BASE)
+
+osgi-install: jni-install
+       $(ARGEO_MAKE) \
+        install --category $(A2_CATEGORY) --bundles $(BUNDLES) \
+        --target $(A2_INSTALL_TARGET)
+
+osgi-uninstall: jni-uninstall
+       $(ARGEO_MAKE) \
+        uninstall --category $(A2_CATEGORY) --bundles $(BUNDLES) \
+        --target $(A2_INSTALL_TARGET)
+
+jni-all: 
+       $(foreach dir, $(JNIDIRS), $(MAKE) -C $(dir) all;)
+       
+jni-clean:
+       $(foreach dir, $(JNIDIRS), $(MAKE) -C $(dir) clean;)
+
+jni-install:
+       $(foreach dir, $(JNIDIRS), $(MAKE) -C $(dir) install;)
+
+jni-uninstall:
+       $(foreach dir, $(JNIDIRS), $(MAKE) -C $(dir) uninstall;)
+
 # Javadoc generation
 javadoc: $(BUILD_BASE)/built
        $(JAVADOC) -noindex -quiet -Xmaxwarns 1 -d $(BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES)
@@ -84,4 +117,6 @@ javadoc: $(BUILD_BASE)/built
 # for example: CLASSPATH = $(subst $(space),$(pathsep),$(strip $(JARS)))
 null  :=
 space := $(null) #
-pathsep := :
\ No newline at end of file
+pathsep := :
+
+.PHONY: osgi manifests javadoc osgi-all osgi-clean osgi-install osgi-uninstall jni-all jni-clean jni-install jni-uninstall