X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=osgi.mk;h=303f5eef4a95acbfba5ca0f2d7231dd06bdfe2ea;hb=0579f7f2fbd8d10e0b7e86b92289ab4bc0fab604;hp=bf578ef14b4b48ed3f8eefb219313cfeb8460a47;hpb=4045e67496934d48c63f68d754da04184f05cd34;p=cc0%2Fargeo-build.git

diff --git a/osgi.mk b/osgi.mk
index bf578ef..303f5ee 100644
--- a/osgi.mk
+++ b/osgi.mk
@@ -5,12 +5,12 @@
 #
 JVM := $(JAVA_HOME)/bin/java
 JAVADOC := $(JAVA_HOME)/bin/javadoc
-ECJ_JAR := $(A2_BASE)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.3.28.jar
+ECJ_JAR := $(A2_BASE)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.3.29.jar
 BND_TOOL := /usr/bin/bnd
 
 BUILD_BASE = $(SDK_BUILD_BASE)/$(A2_CATEGORY)
 
-WORKSPACE_BNDS := $(shell cd $(SDK_SRC_BASE) && find cnf -name '*.bnd')
+WORKSPACE_BNDS := $(shell cd $(SDK_SRC_BASE) && find cnf -name '*.bnd') sdk/argeo-build/argeo.bnd
 BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(BUILD_BASE)/%)
 
 A2_JARS = $(foreach category, $(DEP_CATEGORIES), $(shell find $(A2_BASE)/$(category) -name '*.jar'))
@@ -35,6 +35,10 @@ $(BUILD_BASE)/cnf/%.bnd: cnf/%.bnd
 	mkdir -p $(dir $@)
 	cp $< $@
 	
+$(BUILD_BASE)/sdk/argeo-build/%.bnd: sdk/argeo-build/%.bnd
+	mkdir -p $(dir $@)
+	cp $< $@
+	
 $(A2_OUTPUT)/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar
 	mkdir -p $(dir $@)
 	cp $< $@
@@ -49,18 +53,19 @@ $(BUILD_BASE)/jars-built: $(BNDS)
 
 $(BUILD_BASE)/%/bnd.bnd : %/bnd.bnd $(BUILD_BASE)/java-compiled 
 	mkdir -p $(dir $@)bin
-	rsync -r --exclude "*.java" $(dir  $<)src/ $(dir $@)bin
-	rsync -r --exclude-from $(SDK_SRC_BASE)/sdk/excludes.txt $(dir  $<) $(dir $@)bin
-	if [ -d "$(dir  $<)OSGI-INF" ]; then rsync -r $(dir  $<)OSGI-INF/ $(dir $@)/OSGI-INF; fi
+	#rsync -r --exclude "*.java" $(dir  $<)src/ $(dir $@)bin
+	#rsync -r --exclude-from $(SDK_SRC_BASE)/sdk/argeo-build/excludes.txt $(dir  $<) $(dir $@)bin
+	#if [ -d "$(dir  $<)OSGI-INF" ]; then rsync -r $(dir  $<)OSGI-INF/ $(dir $@)/OSGI-INF; fi
 	cp $< $@
-	echo "\n-sourcepath:$(SDK_SRC_BASE)/$(dir  $<)src\n" >> $@
+	#echo "\n-sourcepath:$(SDK_SRC_BASE)/$(dir  $<)src\n" >> $@
 
 $(BUILD_BASE)/java-compiled : $(JAVA_SRCS)
-	$(JVM) -jar $(ECJ_JAR) @$(SDK_SRC_BASE)/sdk/ecj.args -cp $(A2_CLASSPATH) $(ECJ_SRCS)
+	$(JVM) -jar $(ECJ_JAR) @$(SDK_SRC_BASE)/sdk/argeo-build/ecj.args -cp $(A2_CLASSPATH) $(ECJ_SRCS)
 	touch $@
 
 # Local manifests
 manifests : osgi
+	$(foreach bundle, $(BUNDLES), mkdir -p  $(bundle)/META-INF/;)
 	$(foreach bundle, $(BUNDLES), cp -v $(BUILD_BASE)/$(shell basename $(bundle))/META-INF/MANIFEST.MF  $(bundle)/META-INF/MANIFEST.MF;)
 
 null  :=