diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 6e1fc851..b9f8b2c1 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -42,6 +42,8 @@ EXCLUDE_FROM_BUILD = \ feedfs-qt \ jux3 +BUILD_PROJECTS = $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS)) + ifeq ($(JANWARE_USER),) export JANWARE_USER = $(shell id -un) endif @@ -60,21 +62,26 @@ endif # ------------ commands -PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh) pgit.sh-not-found) -BUILD_PY = python ./ytools/devutil/scripts/build.py -b $(shell pwd) $(BUILD_PY_EXTRA_ARGS) -PURGE_SH = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/purge-stale-projects.sh /opt/ytools/bin/purge-stale-projects.sh) purge-not-found) -RELEASE_SH = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/build-release.sh /opt/ytools/bin/build-release.sh) release-not-found) -BROWSER ?= firefox +MOD_SCRIPT_DIR = ./ytools/devutil/scripts +PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pgit.sh /opt/ytools/bin/pgit.sh) pgit.sh-not-found) +BUILD_PY = python $(MOD_SCRIPT_DIR)/build.py -b $(shell pwd) $(BUILD_PY_EXTRA_ARGS) +PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/ytools/bin/purge-stale-projects.sh) purge-not-found) +RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/ytools/bin/build-release.sh) release-not-found) +BROWSER ?= firefox # ------------ targets all: pull.done all clean: pull.done - $(BUILD_PY) $@ $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS)) + $(BUILD_PY) $@ $(BUILD_PROJECTS) pkg-%: pull.done - $(BUILD_PY) $@ $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS)) + $(BUILD_PY) $@ $(BUILD_PROJECTS) + +echo-required-pkg: + @make pull.done >/dev/null 2>&1 + @python $(MOD_SCRIPT_DIR)/projects.py required-pkg $(BUILD_PROJECTS) clean: done.clean