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

diff --git a/osgi.mk b/osgi.mk
index 6e57706..ad77233 100644
--- a/osgi.mk
+++ b/osgi.mk
@@ -1,15 +1,5 @@
 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
@@ -22,16 +12,16 @@ JAVADOC ?= $(JAVA_HOME)/bin/javadoc
 # 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
+# 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