From 4147f980dcb00c83d3c4b1b01cce273471ec9bf4 Mon Sep 17 00:00:00 2001
From: "ardi@ist-einmalig.de" <ardi@ist-einmalig.de>
Date: Thu, 30 Jul 2009 20:21:44 +0000
Subject: [PATCH] makes the svnrev shit fit for linux. remove svnrev.c

---
 Makefile        |  4 ++--
 source/svnrev.c |  7 -------
 svnrev.sh       | 42 ++++++++++++++++++++++--------------------
 3 files changed, 24 insertions(+), 29 deletions(-)
 delete mode 100644 source/svnrev.c

diff --git a/Makefile b/Makefile
index 132c4efd..cf60b7a9 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,8 @@ export DEPSDIR	:=	$(CURDIR)/$(BUILD)
 #---------------------------------------------------------------------------------
 # automatically build a list of object files for our project
 #---------------------------------------------------------------------------------
-export CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+SVNREV		:=	$(shell sh ./svnrev.sh)
+export CFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
 export CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
 sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
 SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
@@ -124,7 +125,6 @@ release:
 else
 
 DEPENDS	:=	$(OFILES:.o=.d)
-SVNREV	:=	$(shell ../svnrev.sh)
 
 #---------------------------------------------------------------------------------
 # main targets
diff --git a/source/svnrev.c b/source/svnrev.c
deleted file mode 100644
index 4021d379..00000000
--- a/source/svnrev.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#define SVN_REV "675M"
-
-const char *GetRev()
-{ 
-  return SVN_REV;
-}
-
diff --git a/svnrev.sh b/svnrev.sh
index 8d0b0142..32fed47a 100644
--- a/svnrev.sh
+++ b/svnrev.sh
@@ -1,20 +1,22 @@
-#! /bin/sh
-#
-a=$(svnversion -n ..)
-[ -n "$a" ] || a=$(SubWCRev .. | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
-
-[ -f ../source/svnrev.c ] || touch ../source/svnrev.c
-
-b=$(cat ../source/svnrev.c | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
-
-if [ "$a" != "$b" ]; then
-	echo '#define SVN_REV "'$a'"' > ../source/svnrev.c
-	echo '' >> ../source/svnrev.c
-	echo 'const char *GetRev()' >> ../source/svnrev.c
-	echo '{ ' >> ../source/svnrev.c
-	echo '  return SVN_REV;' >> ../source/svnrev.c
-	echo '}' >> ../source/svnrev.c
-	echo '' >> ../source/svnrev.c
-	echo 'svnrev changed' >&2
-fi
-echo $a
+#! /bin/sh
+#
+a=$(svnversion -n . 2> /dev/null)
+[ -n "$a" ] || a=$(SubWCRev . 2> /dev/null| tr -d '\n' | sed 's/[^0-9]*[0-9]*[^0-9]*\([0-9]*\).*/\1/')
+
+[ -f ./source/svnrev.c ] || touch ./source/svnrev.c
+
+b=$(cat ./source/svnrev.c | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
+
+if [ "$a" != "$b" ] || [ ! -n "$a" ]; then
+	[ -n "$a" ] || a='unknow'
+	echo '#define SVN_REV "'$a'"' > ./source/svnrev.c
+	echo '' >> ./source/svnrev.c
+	echo 'const char *GetRev()' >> ./source/svnrev.c
+	echo '{ ' >> ./source/svnrev.c
+	echo '  return SVN_REV;' >> ./source/svnrev.c
+	echo '}' >> ./source/svnrev.c
+	echo '' >> ./source/svnrev.c
+	echo "Changed Rev $b to $a" >&2
+	echo >&2
+fi
+echo $a