X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi.mk;h=b9c65408e1b5d09634e76e4a2dfc31f1ef9b6cd3;hb=abd7ee82834264cddc6bfa4ad8644051cb740f6f;hp=d759efcdf06466a089f97bcfcbe7677e2c8b93f9;hpb=74232bbbcd17259fcaf4b3ff29e30e7a795bc945;p=cc0%2Fargeo-build.git

diff --git a/osgi.mk b/osgi.mk
index d759efc..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.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
 
@@ -52,15 +51,11 @@ $(BUILD_BASE)/built : $(TODOS)
 $(A2_OUTPUT)/%.$(major).$(minor).jar : $(BUILD_BASE)/$$(subst $(A2_CATEGORY)/,,$$*)/to-build
 	$(ARGEO_MAKE) all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) --category $(A2_CATEGORY) --bundles $(subst $(A2_CATEGORY)/,,$*)
 
-$(BUILD_BASE)/%/to-build : $$(shell find $(SDK_SRC_BASE)/% -type f -not -path 'bin/*' -not -path '*/MANIFEST.MF' | sed 's/ /\\ /g')
+$(BUILD_BASE)/%/to-build : $$(shell find % -type f -not -path 'bin/*' -not -path '*/MANIFEST.MF' | sed 's/ /\\ /g')
 	@rm -rf $(dir $@)
 	@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/);