From 5463a9c618c0d08753c2475d69ce151ee2f082e2 Mon Sep 17 00:00:00 2001
From: Michael Iedema <michael.iedema@rangenetworks.com>
Date: Fri, 20 Jun 2014 19:52:19 +0200
Subject: [PATCH] auto-extract repo revs from svn or git as needed - closes
 issue #5

---
 Globals/Globals.cpp     |  4 ++--
 Globals/GrabRepoInfo.sh | 11 +++++++++++
 Makefile.common         |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100755 Globals/GrabRepoInfo.sh

diff --git a/Globals/Globals.cpp b/Globals/Globals.cpp
index e8c32a1..39d4a62 100644
--- a/Globals/Globals.cpp
+++ b/Globals/Globals.cpp
@@ -27,7 +27,7 @@
 
 #define FEATURES "+GPRS "
 
-const char *gVersionString = "release " VERSION FEATURES PROD_CAT " built " TIMESTAMP_ISO " rev" SVN_REV " ";
+const char *gVersionString = "release " VERSION FEATURES PROD_CAT " built " TIMESTAMP_ISO " " REPO_REV " ";
 
 const char* gOpenBTSWelcome =
 	//23456789123456789223456789323456789423456789523456789623456789723456789
@@ -35,7 +35,7 @@ const char* gOpenBTSWelcome =
 	"Copyright 2008, 2009, 2010 Free Software Foundation, Inc.\n"
 	"Copyright 2010 Kestrel Signal Processing, Inc.\n"
 	"Copyright 2011, 2012, 2013, 2014 Range Networks, Inc.\n"
-	"Release " VERSION " " PROD_CAT " formal build date " TIMESTAMP_ISO " rev" SVN_REV "\n"
+	"Release " VERSION " " PROD_CAT " formal build date " TIMESTAMP_ISO " " REPO_REV "\n"
 	"\"OpenBTS\" is a registered trademark of Range Networks, Inc.\n"
 	"\nContributors:\n"
 	"  Range Networks, Inc.:\n"
diff --git a/Globals/GrabRepoInfo.sh b/Globals/GrabRepoInfo.sh
new file mode 100755
index 0000000..c04a31d
--- /dev/null
+++ b/Globals/GrabRepoInfo.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd $1
+
+INFO=""
+if [ -d ./.svn ]; then
+	INFO="r$(svn info . | grep "Last Changed Rev:" | cut -d " " -f 4) CommonLibs:r$(svn info ./CommonLibs | grep "Last Changed Rev:" | cut -d " " -f 4)"
+elif [ -d ./.git ]; then
+	INFO="$(git rev-parse --short=10 HEAD) CommonLibs:$(cd CommonLibs; git rev-parse --short=10 HEAD)"
+fi
+
+echo $INFO
diff --git a/Makefile.common b/Makefile.common
index 0436180..3fa2181 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -41,10 +41,10 @@ NODEMANAGER_INCLUDEDIR = $(top_srcdir)/NodeManager
 JSONBOX_INCLUDEDIR = $(top_srcdir)/NodeManager/JsonBox-0.4.3/include
 SCANNING_INCLUDEDIR = $(top_srcdir)/Scanning
 
-SVNDEV = -D'SVN_REV="$(shell svn info $(top_builddir) | grep "Last Changed Rev:" | cut -d " " -f 4) CommonLibs:rev$(shell svn info $(top_builddir)/CommonLibs | grep "Last Changed Rev:" | cut -d " " -f 4)"'
+REPOREV = -D'REPO_REV="$(shell ./$(top_builddir)/Globals/GrabRepoInfo.sh $(top_builddir))"'
 
 STD_DEFINES_AND_INCLUDES = \
-	$(SVNDEV) \
+	$(REPOREV) \
 	-I$(COMMON_INCLUDEDIR) \
 	-I$(CONTROL_INCLUDEDIR) \
 	-I$(GSM_INCLUDEDIR) \