X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi.mk;h=d759efcdf06466a089f97bcfcbe7677e2c8b93f9;hb=74232bbbcd17259fcaf4b3ff29e30e7a795bc945;hp=14374ecbb9d27fe11aad774e5a2016a0a4f5d651;hpb=44d8ea067159cd2c59f4cce21884d55c0cd96652;p=cc0%2Fargeo-build.git diff --git a/osgi.mk b/osgi.mk index 14374ec..d759efc 100644 --- a/osgi.mk +++ b/osgi.mk @@ -46,11 +46,11 @@ javadoc: $(BUILD_BASE)/built # Actual build (compilation + bundle packaging) $(BUILD_BASE)/built : BUNDLES_TO_BUILD = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-build,, $?)) $(BUILD_BASE)/built : $(TODOS) - $(ARGEO_MAKE) all --branch $(BRANCH) --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) --category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD) + $(ARGEO_MAKE) all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) --category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD) touch $(BUILD_BASE)/built $(A2_OUTPUT)/%.$(major).$(minor).jar : $(BUILD_BASE)/$$(subst $(A2_CATEGORY)/,,$$*)/to-build - $(ARGEO_MAKE) all --branch $(BRANCH) --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) --category $(A2_CATEGORY) --bundles $(subst $(A2_CATEGORY)/,,$*) + $(ARGEO_MAKE) all --a2-bases $(A2_BASE) --dep-categories $(DEP_CATEGORIES) --category $(A2_CATEGORY) --bundles $(subst $(A2_CATEGORY)/,,$*) $(BUILD_BASE)/%/to-build : $$(shell find $(SDK_SRC_BASE)/% -type f -not -path 'bin/*' -not -path '*/MANIFEST.MF' | sed 's/ /\\ /g') @rm -rf $(dir $@)