Improve documentation

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

diff --git a/osgi.mk b/osgi.mk
index 6e57706314c641fd3b1e7786cad12acd8bbf2fdd..4af7fff925db3c6dc54edd2595dcf4d2e50698b3 100644 (file)
--- a/osgi.mk
+++ b/osgi.mk
@@ -1,37 +1,27 @@
 ARGEO_BUILD_BASE := $(dir $(lastword $(MAKEFILE_LIST)))
 include $(ARGEO_BUILD_BASE)common.mk
-#
-# Common build routines to be included in Makefiles
-#
-# The following variables are found in the sdk.mk file which is generated by the configure script:
-# 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
-JVM ?= $(JAVA_HOME)/bin/java
-JAVADOC ?= $(JAVA_HOME)/bin/javadoc
 
 # 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
+# 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    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 ?=
-A2_BASE ?=/usr/share/a2 /usr/local/share/a2 $(A2_OUTPUT)
+NATIVE_PACKAGES ?=
 
 # 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))))
+ECJ_JAR ?= $(firstword $(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)/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)))
+LOGGER_JAR ?= $(firstword $(foreach base, $(A2_BASE), $(wildcard $(base)/log/syslogger/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar)))
+BNDLIB_JAR ?= $(firstword $(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