X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi.mk;h=303f5eef4a95acbfba5ca0f2d7231dd06bdfe2ea;hb=0579f7f2fbd8d10e0b7e86b92289ab4bc0fab604;hp=17133d647e2d0986721d806def90ba2ef70c747a;hpb=90dfe68dd0a8f9510939b2a276aed3d79e563bb2;p=cc0%2Fargeo-build.git diff --git a/osgi.mk b/osgi.mk index 17133d6..303f5ee 100644 --- a/osgi.mk +++ b/osgi.mk @@ -5,7 +5,7 @@ # 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) @@ -53,11 +53,11 @@ $(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/argeo-build/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/argeo-build/ecj.args -cp $(A2_CLASSPATH) $(ECJ_SRCS)