X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=sdk%2Fosgi.mk;h=caa42daaed8bc30b7709ef13ffa8fa8349d8fc89;hb=ef0980ba1f409c4b1071f1efb2fc5ae3ac11534b;hp=a97a937f82f0b5186ea4752e337f2138ce45e478;hpb=b6c9c86547ad1828606426ad1e6c4470bcfc13a4;p=lgpl%2Fargeo-commons.git diff --git a/sdk/osgi.mk b/sdk/osgi.mk index a97a937f8..caa42daae 100644 --- a/sdk/osgi.mk +++ b/sdk/osgi.mk @@ -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" >> $@