Simplify dealing with multiple a2 bases

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

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