Make OSGi build more flexible

[gpl/argeo-suite.git] / sdk / osgi.mk

diff --git a/sdk/osgi.mk b/sdk/osgi.mk
index a97a937f82f0b5186ea4752e337f2138ce45e478..bf578ef14b4b48ed3f8eefb219313cfeb8460a47 100644 (file)
--- a/sdk/osgi.mk
+++ b/sdk/osgi.mk
@@ -5,7 +5,7 @@
 #
 JVM := $(JAVA_HOME)/bin/java
 JAVADOC := $(JAVA_HOME)/bin/javadoc
-ECJ_JAR := $(SDK_BUILD_BASE)/a2/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.28.jar
 BND_TOOL := /usr/bin/bnd
 
 BUILD_BASE = $(SDK_BUILD_BASE)/$(A2_CATEGORY)
@@ -35,7 +35,7 @@ $(BUILD_BASE)/cnf/%.bnd: cnf/%.bnd
        mkdir -p $(dir $@)
        cp $< $@
        
-$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar
+$(A2_OUTPUT)/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar
        mkdir -p $(dir $@)
        cp $< $@
 
@@ -50,6 +50,7 @@ $(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
        cp $< $@
        echo "\n-sourcepath:$(SDK_SRC_BASE)/$(dir  $<)src\n" >> $@