From 69132d9246a75e4f68ad6144dfa5fd56fde424bc Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 18 Nov 2025 15:55:20 +0100 Subject: [PATCH] projects-dir[-minimal].mk: Support PROJECTS_DIR_REMOTE_BASE Add the variable PROJECTS_DIR_REMOTE_BASE, defaulting to ssh://git.janware.com/srv/git if REMOTE_USER is defined, and to https://janware.com/code in case it isn't. Signed-off-by: Jan Lindemann --- make/projects-dir-minimal.mk | 10 +++++++++- make/projects-dir.mk | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/make/projects-dir-minimal.mk b/make/projects-dir-minimal.mk index c6cc457a..e12828ef 100644 --- a/make/projects-dir-minimal.mk +++ b/make/projects-dir-minimal.mk @@ -18,7 +18,15 @@ # PROJECTS_MAKEFILE_NAME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -JWBDIR_GIT_REMOTE ?= ssh://$(JANWARE_USER)@git.janware.com/srv/git/jan/proj/jw-build + +ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined) + ifneq ($(JANWARE_USER),) + PROJECTS_DIR_REMOTE_BASE ?= ssh://$(JANWARE_USER)@git.janware.com/srv/git/jan$(PROJECTS_DIR_REMOTE_SUBPATH)/jw-build + else + PROJECTS_DIR_REMOTE_BASE ?= https://janware.com/code/janware + endif +endif +JWBDIR_GIT_REMOTE ?= $(PROJECTS_DIR_REMOTE_BASE)/jw-build JWBDIR ?= $(notdir $(JWBDIR_GIT_REMOTE)) PROJECTS_DIR_INCLUDE_MK = $(JWBDIR)/make/projects-dir-include.mk diff --git a/make/projects-dir.mk b/make/projects-dir.mk index d2434356..822b4db2 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -124,6 +124,9 @@ PROJECTS_PY = PYTHONPATH=$(realpath $(JWBDIR)/src/python) $(TIM PROJECTS_PY_BUILD = $(PROJECTS_PY) build $(PROJECTS_PY_EXTRA_BUILD_OPTS) PGIT_SH = /bin/bash $(JWB_SCRIPT_DIR)/pgit.sh PGIT_SH_CLONE = $(PGIT_SH) clone +ifneq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined) + PGIT_SH += --remote-base $(PROJECTS_DIR_REMOTE_BASE) +endif PURGE_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh $(JW_BUILD_BINDIR)/purge-stale-projects.sh) purge-not-found) PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/pkg-manager.sh $(JW_BUILD_BINDIR)/pkg-manager.sh) pkg-manager-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-build-create-project.sh $(JW_BUILD_BINDIR)/jw-build-create-project.sh) jw-build-create-project-not-found)