2
0
Эх сурвалжийг харах

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

Pierre Muller 4 жил өмнө
parent
commit
a7ad65f884

+ 1 - 1
tests/Makefile

@@ -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

+ 1 - 1
tests/Makefile.fpc

@@ -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)