From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 8 Mar 2023 18:04:49 +0000 (+0100)
Subject: Use rebuilt ECJ and BND
X-Git-Tag: v2.3.5~121
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=abd7ee82834264cddc6bfa4ad8644051cb740f6f;p=cc0%2Fargeo-build.git

Use rebuilt ECJ and BND
---

diff --git a/osgi.mk b/osgi.mk
index 9b0c52e..b9c6540 100644
--- a/osgi.mk
+++ b/osgi.mk
@@ -21,10 +21,9 @@ DEP_CATEGORIES ?=
 JAVADOC_PACKAGES ?=
 A2_BASE ?= $(A2_OUTPUT)
 
-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
-SLF4J_API_JAR ?= $(A2_BASE)/org.argeo.tp/org.slf4j.api.1.7.jar
-ARGEO_MAKE := $(JVM) -cp $(ECJ_JAR):$(BNDLIB_JAR):$(SLF4J_API_JAR) $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Make.java
+ECJ_JAR ?= $(A2_BASE)/org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch.3.32.jar
+BNDLIB_JAR ?= $(A2_BASE)/org.argeo.tp.build/biz.aQute.bndlib.5.3.jar
+ARGEO_MAKE := $(JVM) -cp $(ECJ_JAR):$(BNDLIB_JAR) $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Make.java
 #ARGEO_MAKE = $(JVM) -cp $(ECJ_JAR):$(BNDLIB_JAR):$(SLF4J_API_JAR):$(BUILD_BASE)/bin org/argeo/build/Make
 
 JAVADOC_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src)