Fix use of svnversion if ../.git does not exist

This commit is contained in:
Pierre Muller 2021-09-25 17:15:35 +02:00
parent cbf444bbbe
commit a7ad65f884
2 changed files with 2 additions and 2 deletions

View File

@ -2764,6 +2764,7 @@ SVN_TESTS_REV_STR=$(shell $(GIT_GET_HASH) .)
SVN_COMPILER_REV_STR=$(shell $(GIT_GET_HASH) ../compiler)
SVN_RTL_REV_STR=$(shell $(GIT_GET_HASH) ../rtl)
SVN_PACKAGES_REV_STR=$(shell $(GIT_GET_HASH) ../packages)
endif
else
ifneq ($(SVNVERSION),)
SVN_TESTS_REV_STR=$(shell $(SVNVERSION) -c .)
@ -2772,7 +2773,6 @@ SVN_RTL_REV_STR=$(shell $(SVNVERSION) -c ../rtl)
SVN_PACKAGES_REV_STR=$(shell $(SVNVERSION) -c ../packages)
endif
endif
endif
ifeq ($(TEST_COMMENT),)
TEST_COMMENT=$(TEST_OPT)
endif

View File

@ -628,6 +628,7 @@ SVN_TESTS_REV_STR=$(shell $(GIT_GET_HASH) .)
SVN_COMPILER_REV_STR=$(shell $(GIT_GET_HASH) ../compiler)
SVN_RTL_REV_STR=$(shell $(GIT_GET_HASH) ../rtl)
SVN_PACKAGES_REV_STR=$(shell $(GIT_GET_HASH) ../packages)
endif
else
ifneq ($(SVNVERSION),)
SVN_TESTS_REV_STR=$(shell $(SVNVERSION) -c .)
@ -636,7 +637,6 @@ SVN_RTL_REV_STR=$(shell $(SVNVERSION) -c ../rtl)
SVN_PACKAGES_REV_STR=$(shell $(SVNVERSION) -c ../packages)
endif
endif
endif
ifeq ($(TEST_COMMENT),)
TEST_COMMENT=$(TEST_OPT)