paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-08 09:23:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile
View File

@ -2764,6 +2764,7 @@ SVN_TESTS_REV_STR=$(shell $(GIT_GET_HASH) .)
SVN_COMPILER_REV_STR=$(shell $(GIT_GET_HASH) ../compiler) SVN_COMPILER_REV_STR=$(shell $(GIT_GET_HASH) ../compiler)
SVN_RTL_REV_STR=$(shell $(GIT_GET_HASH) ../rtl) SVN_RTL_REV_STR=$(shell $(GIT_GET_HASH) ../rtl)
SVN_PACKAGES_REV_STR=$(shell $(GIT_GET_HASH) ../packages) SVN_PACKAGES_REV_STR=$(shell $(GIT_GET_HASH) ../packages)
endif
else else
ifneq ($(SVNVERSION),) ifneq ($(SVNVERSION),)
SVN_TESTS_REV_STR=$(shell $(SVNVERSION) -c .) 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) SVN_PACKAGES_REV_STR=$(shell $(SVNVERSION) -c ../packages)
endif endif
endif endif
endif
ifeq ($(TEST_COMMENT),) ifeq ($(TEST_COMMENT),)
TEST_COMMENT=$(TEST_OPT) TEST_COMMENT=$(TEST_OPT)
endif endif

2
tests/Makefile.fpc
View File

@ -628,6 +628,7 @@ SVN_TESTS_REV_STR=$(shell $(GIT_GET_HASH) .)
SVN_COMPILER_REV_STR=$(shell $(GIT_GET_HASH) ../compiler) SVN_COMPILER_REV_STR=$(shell $(GIT_GET_HASH) ../compiler)
SVN_RTL_REV_STR=$(shell $(GIT_GET_HASH) ../rtl) SVN_RTL_REV_STR=$(shell $(GIT_GET_HASH) ../rtl)
SVN_PACKAGES_REV_STR=$(shell $(GIT_GET_HASH) ../packages) SVN_PACKAGES_REV_STR=$(shell $(GIT_GET_HASH) ../packages)
endif
else else
ifneq ($(SVNVERSION),) ifneq ($(SVNVERSION),)
SVN_TESTS_REV_STR=$(shell $(SVNVERSION) -c .) 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) SVN_PACKAGES_REV_STR=$(shell $(SVNVERSION) -c ../packages)
endif endif
endif endif
endif
ifeq ($(TEST_COMMENT),) ifeq ($(TEST_COMMENT),)
TEST_COMMENT=$(TEST_OPT) TEST_COMMENT=$(TEST_OPT)