X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=sdk%2Fosgi.mk;h=bf578ef14b4b48ed3f8eefb219313cfeb8460a47;hb=91e07cbcf67fdadf1e1b7233a458fc7bc69cc6e5;hp=25491f518ac61868229d528e368a8ca05bfb4193;hpb=dbab58c3cd06ae861653f1bd8e664525fbfdb2c2;p=gpl%2Fargeo-suite.git diff --git a/sdk/osgi.mk b/sdk/osgi.mk index 25491f5..bf578ef 100644 --- 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) @@ -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" >> $@