Try to get the version identification working with git

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6935 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/scripts/simgrid_build.functions b/buildtools/scripts/simgrid_build.functions
index d012ff4..d028bca 100644 (file)
--- a/buildtools/scripts/simgrid_build.functions
+++ b/buildtools/scripts/simgrid_build.functions
@@ -6,8 +6,12 @@
 get_version() {
   if [ x$version = x ] ; then
     cd ${SIMGRID_SVN_ROOT}
-    svn up
-    version="simgrid-3.3.4-svn-r"`svnversion`
+    if [ -e .svn ] ; then
+      svn up
+      version="simgrid-3.3.4-svn-r"`svnversion`
+    else if [ -e .git ] ; then
+      version="simgrid-3.3.4-git-r"`git describe --long --all | sed 's|.*/||'`
+    fi fi
     export version
   fi
 }

diff --git a/configure.ac b/configure.ac
index bfb838f..06423e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,13 @@ AC_PROG_LIBTOOL
 if test -e .svn && echo $VERSION | grep -q svn; then
   VERSION="$VERSION-r`svnversion`"
   PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`"
-  PACKAGE_STRING="$PACKAGE_STRING r`svnversion`"  
-fi
+  PACKAGE_STRING="$PACKAGE_STRING r`svnversion`"
+else if test -e .git && echo $VERSION | grep -q svn; then
+  ver=`git describe --long --all | sed 's|.*/||'`
+  VERSION=`echo "$VERSION-r$ver" | sed 's/svn/git/'`
+  PACKAGE_VERSION=`echo "$PACKAGE_VERSION-r$ver" | sed 's/svn/git/'`
+  PACKAGE_STRING=`echo "$PACKAGE_STRING r$ver" | sed 's/svn/git/'`
+fi fi
 
 ###############
 ## System checks