Simplify dealing with multiple a2 bases

diff --git a/common.mk b/common.mk
index 05d882ffb9468c26eb6e85053ec492bed67505e6..9f0cf2e3af1f368a76810cb5624d097338776d86 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -3,11 +3,14 @@ build-minor=3
 
 # Required third party libraries
 ECJ_BRANCH=4.26
-BND_BRANCH=5.3
+BNDLIB_BRANCH=5.3
 SYSLOGGER_BRANCH=$(build-major).$(build-minor)
 
+#A2_BASE=/home/mbaudier/dev/git/unstable/output/a2 /home/mbaudier/dev/git/unstable/argeo-qa/build/argeo/output/a2 test
+
 find-build-tp:
-       $(foreach base, $(A2_BASE), \
-       $(eval LOGGER_JAR = $(shell if [ -f $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar ]; then echo $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar; fi)) \
-       )
+       $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar)))
+       ##$(eval LOGGER_JAR = $(shell if [ -f $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar ]; then echo $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar; fi)) \
+       #)
+#      $(if $(wildcard $(candidate)), $(eval LOGGER_JAR = $(candidate))) \     
        echo $(LOGGER_JAR)
\ No newline at end of file

diff --git a/osgi.mk b/osgi.mk
index 34ecbcc7c71b39f7510276347c9a437f36a34394..1513d46761b942de09b1d35de577028886ffb45c 100644 (file)
--- a/osgi.mk
+++ b/osgi.mk
@@ -23,9 +23,11 @@ DEP_CATEGORIES ?=
 JAVADOC_PACKAGES ?=
 A2_BASE ?= $(A2_OUTPUT)
 
-#LOGGER_JAR ?= $(A2_BASE)/org.argeo.tp/org.argeo.tp.syslogger.2.3.jar
-ECJ_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.3.32.jar
-BNDLIB_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/biz.aQute.bndlib.5.3.jar
+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)))
+#ECJ_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.3.32.jar
+BNDLIB_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp.sdk/biz.aQute.bndlib.$(BNDLIB_BRANCH).jar)))
+#BNDLIB_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/biz.aQute.bndlib.5.3.jar
 ARGEO_MAKE = $(JVM) -cp $(LOGGER_JAR):$(ECJ_JAR):$(BNDLIB_JAR) $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Make.java
 
 JAVADOC_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src)
@@ -39,7 +41,7 @@ TODOS = $(foreach bundle, $(BUNDLES),$(BUILD_BASE)/$(bundle)/to-build)
 .SECONDEXPANSION:
 .PHONY: osgi manifests javadoc
 
-osgi: find-build-tp $(BUILD_BASE)/built
+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)