From abd7ee82834264cddc6bfa4ad8644051cb740f6f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 8 Mar 2023 19:04:49 +0100 Subject: [PATCH] Use rebuilt ECJ and BND --- osgi.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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) -- 2.30.2