Use rebuilt ECJ and BND

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

diff --git a/osgi.mk b/osgi.mk
index d5b031e0501a51be16af4d0f5394bae32024cf1c..b9c65408e1b5d09634e76e4a2dfc31f1ef9b6cd3 100644 (file)
--- 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.29.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)
@@ -36,7 +35,7 @@ TODOS = $(foreach bundle, $(BUNDLES),$(BUILD_BASE)/$(bundle)/to-build)
 
 ## Needed in order to be able to expand $$ variables
 .SECONDEXPANSION:
-.PHONY: clean-a2 osgi manifests javadoc
+.PHONY: osgi manifests javadoc
 
 osgi: $(BUILD_BASE)/built
 
@@ -57,10 +56,6 @@ $(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path
        @mkdir -p $(dir $@) 
        @touch $@
 
-clean-a2 :
-       rm -rf $(TARGET_BUNDLES)
-       rm -rf $(BUILD_BASE)/built
-
 # Local manifests
 manifests : osgi
        @mkdir -p $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/);