projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d4a5c6f
)
Always use the latest version of the ECJ compiler
author
Mathieu Baudier <mbaudier@argeo.org>
Thu, 20 Jul 2023 03:58:25 +0000
(
05:58
+0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Thu, 20 Jul 2023 03:58:25 +0000
(
05:58
+0200)
common.mk
patch
|
blob
|
history
osgi.mk
patch
|
blob
|
history
diff --git
a/common.mk
b/common.mk
index bc1fa82b0cc89a950f146a52116154050d119a02..46b03984697b9a2ce6049b2f36a5af5a1fb7e778 100644
(file)
--- a/
common.mk
+++ b/
common.mk
@@
-2,7
+2,7
@@
build-major=2
build-minor=3
# Required third party libraries
build-minor=3
# Required third party libraries
-ECJ_
BRANCH=3.32
+ECJ_
MAJOR=3
BNDLIB_BRANCH=5.3
SYSLOGGER_BRANCH=$(build-major).$(build-minor)
BNDLIB_BRANCH=5.3
SYSLOGGER_BRANCH=$(build-major).$(build-minor)
diff --git
a/osgi.mk
b/osgi.mk
index 52bdba6443406c039693cb49fc232f7ac77d3ef5..3f17e6dd01d0576a196f172678375bbf85df7793 100644
(file)
--- a/
osgi.mk
+++ b/
osgi.mk
@@
-27,9
+27,10
@@
DEP_CATEGORIES ?=
JAVADOC_PACKAGES ?=
A2_BASE ?=/usr/share/a2 /usr/local/share/a2 $(A2_OUTPUT)
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)/log/syslogger/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).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)))
-ECJ_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch.$(ECJ_BRANCH).jar)))
BNDLIB_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp.build/biz.aQute.bndlib.$(BNDLIB_BRANCH).jar)))
# Internal variables
BNDLIB_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp.build/biz.aQute.bndlib.$(BNDLIB_BRANCH).jar)))
# Internal variables