From 05f72596ddff4bc0fbf363d6032d1d86ef9e3f52 Mon Sep 17 00:00:00 2001 From: Theobald Wichtich Date: Fri, 7 Apr 2017 18:08:15 +0000 Subject: [PATCH] projects-dir.mk: Run off jw-build Signed-off-by: Theobald Wichtich --- make/projects-dir.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 1bda9d2d..1fece65c 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -45,11 +45,11 @@ endif # ------------ commands -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) +MOD_SCRIPT_DIR = ./jw-build/scripts +PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pgit.sh /opt/jw-build/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) +PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found) +RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/jw-build/bin/build-release.sh) release-not-found) BROWSER ?= firefox # ------------ targets @@ -157,7 +157,7 @@ git-conv-%: } check-conv: - for p in `ssh $(JANWARE_USER)@git.jannet.de /opt/ytools/bin/git-srv-admin.sh -u jan -j list-personal-projects`; do \ + for p in `ssh $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh -u jan -j list-personal-projects`; do \ make git-conv-$$p ;\ done @@ -168,7 +168,7 @@ done.clean: rm -f *.done config.done: cvs-update.done - make -C ytools config + if [ -d ytools ]; then make -C ytools config; fi touch $@ links.done: