roll version to 1.8.1 for conversion to git repository

diff --git a/ChangeLog b/ChangeLog
index 5f0efc3c8469bb59fc463d165e68cc4e6789685d..595bda6aafa48cb5c4f1d0404ed168e2acbb018e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
 /***********************************************************************
 X3 ChangeLog
 
-2013-02-18  Alex Schumann <rubin@afternet.org>
-        * all: Converted from mercurial to git. (testing email commit messages again)
+2013-02-18  Alex Schumann  <rubin@afternet.org>
+       * all: Converted from mercurial to git. (testing email commit messages again)
+       * configure.in: Roll version to 1.8.1
+       * src/version.c.SH: replace hg version string with git one
 
 2013-01-27  Matthew Beeching  <jobe@mdbnet.co.uk>
 

diff --git a/configure.in b/configure.in
index 1e834183969616b5ac9521752a0b5fc23ff0a1ab..59888b6544926f0ff2f68270dc5381c37d297111 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create a configure script.
 dnl General initialization.
 AC_REVISION([$Id$])
 AC_PREREQ(2.61)
-AC_INIT([X3],[1.8],[evilnet-devel@lists.sourceforge.net])
+AC_INIT([X3],[1.8.1],[evilnet-devel@lists.sourceforge.net])
 CODENAME=X3
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/opserv.c)

diff --git a/src/version.c.SH b/src/version.c.SH
index 8be88df58226323ff129325a25770137441d2e38..f3b3a15ef4b53cc3d646679f49bc7fa9d3441ee2 100755 (executable)
--- a/src/version.c.SH
+++ b/src/version.c.SH
@@ -1,14 +1,23 @@
 #! /bin/sh
 
+#TODO: we should tag our version changes, and use git describe instead of git log.
+
 echo "Extracting src/version.c ..."
 
-if test -f ../.release
-then
-        cvs_version=`cat ../.release`
+if [ -d ../.git ]; then
+    if [ -x `which git` ]; then
+        echo "Found git. version is"`git log -1 --pretty=oneline`
+        cvs_version="git:"`git log -1 --pretty=oneline`
+    else
+        echo "No git installed. unknown git revision"
+        cvs_version="unknown"
+    fi
 else
-        cvs_version=`hg tip --template '{rev}:{node|short} {date|shortdate}'`
+    echo "Not a git repository. leaving revision empty"
+    cvs_version="not git"
 fi
 
+
 /bin/cat >version.c <<!SUB!THIS!
 /* version.c - CVS Version specific information.
  * Copyright 2000-2004 srvx Development Team