From e6a2fe4744accf68456860c09bc3c5ac6493d196 Mon Sep 17 00:00:00 2001
From: weissms <weissms@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Mon, 19 Mar 2012 17:35:14 +0000
Subject: [PATCH] Get svn revision via 'svn info' or 'git log'.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@44434 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 rom/dos/mmakefile.src                    |  2 +-
 scripts/svnrev.sh                        | 15 +++++++++++++++
 workbench/system/AboutAROS/mmakefile.src |  8 ++++----
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100755 scripts/svnrev.sh

diff --git a/rom/dos/mmakefile.src b/rom/dos/mmakefile.src
index 14822d8aa9..9309d7c8fe 100644
--- a/rom/dos/mmakefile.src
+++ b/rom/dos/mmakefile.src
@@ -1,7 +1,7 @@
 # $Id$
 include $(TOP)/config/make.cfg
 
-SVNREV        := $(shell svn info $(SRCDIR) | sed -n 's/Revision: //p')
+SVNREV        := $(shell $(SRCDIR)/scripts/svnrev.sh $(SRCDIR))
 USER_INCLUDES := -I$(GENDIR)/$(CURDIR)
 USER_CFLAGS   := -D__DOS_NOLIBBASE__ -DISODATE="\"$(shell date '+%Y-%m-%d')\"" -DSVNREV=\"$(SVNREV)\"
 
diff --git a/scripts/svnrev.sh b/scripts/svnrev.sh
new file mode 100755
index 0000000000..948ddbce96
--- /dev/null
+++ b/scripts/svnrev.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# get svn revision via svn or via git
+#
+
+if test -d $1/.svn; then
+    svn info $(SRCDIR) | sed -n 's/Revision: //p'
+else
+    if test -d $1/.git; then
+        cd $1
+        git log -1 | grep git-svn-id | sed 's|.*@\(.*\) .*|\1|'
+    else
+        echo "NoRev"
+    fi
+fi
diff --git a/workbench/system/AboutAROS/mmakefile.src b/workbench/system/AboutAROS/mmakefile.src
index 413ad4c446..71ee2ce2d4 100644
--- a/workbench/system/AboutAROS/mmakefile.src
+++ b/workbench/system/AboutAROS/mmakefile.src
@@ -1,12 +1,12 @@
-# Copyright © 2003, The AROS Development Team. All rights reserved.
+# Copyright © 2003, 2012, The AROS Development Team. All rights reserved.
 # $Id$
 
 include $(TOP)/config/make.cfg
 
-FILES 	    := main aboutaros locale
-EXEDIR      := $(AROS_SYSTEM)
+FILES        := main aboutaros locale
+EXEDIR       := $(AROS_SYSTEM)
 
-SVNREV       := $(shell svn info $(SRCDIR) | sed -n 's/Revision: //p')
+SVNREV       := $(shell $(SRCDIR)/scripts/svnrev.sh $(SRCDIR))
 USER_CFLAGS  := -DADATE="\"$(shell date '+%d.%m.%Y')\"" -DSVNREV=\"$(SVNREV)\"
 USER_INCLUDES = -I$(TOP)/$(CURDIR) -I$(SRCDIR)/$(CURDIR)
 
-- 
2.11.4.GIT