X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi.mk;h=b93e06ca04f9bd0a1b5d96d2ea81fc7ba3ac3417;hb=03d08d59645f4a6c126ebf089a258e9e2c8331f6;hp=495fe1ae9ae4fd9fefb5ade41efc9ef497f92080;hpb=bd435d52540ba6d3d6bfde05f17a6a3e205e4235;p=cc0%2Fargeo-build.git diff --git a/osgi.mk b/osgi.mk index 495fe1a..b93e06c 100644 --- a/osgi.mk +++ b/osgi.mk @@ -22,7 +22,7 @@ JAVADOC_PACKAGES ?= A2_BASE ?= $(A2_OUTPUT) ECJ_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.3.31.jar -BNDLIB_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/biz.aQute.bndlib.6.3.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 #ARGEO_MAKE = $(JVM) -cp $(ECJ_JAR):$(BNDLIB_JAR):$(SLF4J_API_JAR):$(BUILD_BASE)/bin org/argeo/build/Make @@ -36,7 +36,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 +57,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/);