From aacb5605e05c08795b8f9f2bd9831942c87f93ed Mon Sep 17 00:00:00 2001 From: Niko Kivel Date: Wed, 29 Mar 2023 15:53:50 -0600 Subject: [PATCH] added GIT_DOMAIN for ORIGIN --- App/tools/driver.makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile index c5fc0c4..9da9922 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -71,6 +71,7 @@ BUILDCLASSES = vxWorks Linux WIN32 EPICS_MODULES ?= /ioc/modules MODULE_LOCATION = ${EPICS_MODULES}/$(or ${PRJ},$(error PRJ not defined))/$(or ${LIBVERSION},$(error LIBVERSION not defined)) EPICS_LOCATION = /usr/local/epics +GIT_DOMAIN = psi.ch DOCUEXT = txt html htm doc pdf ps tex dvi gif jpg png DOCUEXT += TXT HTML HTM DOC PDF PS TEX DVI GIF JPG PNG @@ -179,7 +180,7 @@ export MAKE_FIRST export SUBMODULES export USE_LIBVERSION -export ORIGIN=$(firstword $(shell git remote -v 2>/dev/null | awk '/psi.ch.*(fetch)/{print $$2;exit}')$(patsubst %,[%],$(shell git describe --tags --dirty --always --long 2>/dev/null)) $(PWD)) +export ORIGIN=$(firstword $(shell git remote -v 2>/dev/null | awk '/${GIT_DOMAIN}.*(fetch)/{print $$2;exit}')$(patsubst %,[%],$(shell git describe --tags --dirty --always --long 2>/dev/null)) $(PWD)) # Some shell commands: RMDIR = rm -rf @@ -255,6 +256,7 @@ debug:: @echo "VERSIONCHECKFILES = ${VERSIONCHECKFILES}" @echo "ARCH_FILTER = ${ARCH_FILTER}" @echo "PRJ = ${PRJ}" + @echo "GIT_DOMAIN = ${GIT_DOMAIN}" what:: @echo "LIBVERSION = ${LIBVERSION}"