[iortcw] 148/497: All: Attempt to fix svn versioning on newer subversion clients

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 2deb294e4a1a185a38c4a5effbae458d30b3b43a
Author: M4N4T4RMS <M4N4T4RMS at e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Sun Jun 22 14:30:16 2014 +0000

    All: Attempt to fix svn versioning on newer subversion clients
---
 MP/Makefile | 15 +++++----------
 SP/Makefile | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 921b00d..2051e89 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -318,18 +318,13 @@ endif
 
 # Add svn version info
 ifeq ($(USE_SVN),1)
-  ifeq ($(wildcard .svn),.svn)
+  ifeq ($(wildcard ../.svn),../.svn)
     SVN_REV=$(shell LANG=C svnversion .)
     ifneq ($(SVN_REV),)
       VERSION:=$(VERSION)_SVN$(SVN_REV)
     endif
   else
-  ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata)
-    SVN_REV=$(shell LANG=C git svn info | awk '$$1 == "Revision:" {print $$2; exit 0}')
-    ifneq ($(SVN_REV),)
-      VERSION:=$(VERSION)_SVN$(SVN_REV)
-    endif
-  endif
+    USE_SVN=0
   endif
 endif
 
@@ -2497,9 +2492,9 @@ $(B)/ded/%.o: $(NDIR)/%.c
 
 # Extra dependencies to ensure the SVN version is incorporated
 ifeq ($(USE_SVN),1)
-  $(B)/client/cl_console.o : .svn/entries
-  $(B)/client/common.o : .svn/entries
-  $(B)/ded/common.o : .svn/entries
+  $(B)/client/cl_console.o : ../.svn/entries
+  $(B)/client/common.o : ../.svn/entries
+  $(B)/ded/common.o : ../.svn/entries
 endif
 
 
diff --git a/SP/Makefile b/SP/Makefile
index 3f0e35c..911b0b3 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -315,18 +315,13 @@ endif
 
 # Add svn version info
 ifeq ($(USE_SVN),1)
-  ifeq ($(wildcard .svn),.svn)
+  ifeq ($(wildcard ../.svn),../.svn)
     SVN_REV=$(shell LANG=C svnversion .)
     ifneq ($(SVN_REV),)
       VERSION:=$(VERSION)_SVN$(SVN_REV)
     endif
   else
-  ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata)
-    SVN_REV=$(shell LANG=C git svn info | awk '$$1 == "Revision:" {print $$2; exit 0}')
-    ifneq ($(SVN_REV),)
-      VERSION:=$(VERSION)_SVN$(SVN_REV)
-    endif
-  endif
+    USE_SVN=0
   endif
 endif
 
@@ -2508,9 +2503,9 @@ $(B)/ded/%.o: $(NDIR)/%.c
 
 # Extra dependencies to ensure the SVN version is incorporated
 ifeq ($(USE_SVN),1)
-  $(B)/client/cl_console.o : .svn/entries
-  $(B)/client/common.o : .svn/entries
-  $(B)/ded/common.o : .svn/entries
+  $(B)/client/cl_console.o : ../.svn/entries
+  $(B)/client/common.o : ../.svn/entries
+  $(B)/ded/common.o : ../.svn/entries
 endif
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git