Shorter git identification since tar don't want to deal with filenames longer than...

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

diff --git a/buildtools/scripts/simgrid_build.functions b/buildtools/scripts/simgrid_build.functions
index d028bca..8ae1b90 100644 (file)
--- a/buildtools/scripts/simgrid_build.functions
+++ b/buildtools/scripts/simgrid_build.functions
@@ -10,7 +10,7 @@ get_version() {
       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|.*/||'`
+      version="simgrid-3.3.4-git-r"`git log --oneline -1 | sed 's| .*||'`
     fi fi
     export version
   fi

diff --git a/configure.ac b/configure.ac
index 06423e4..d14eda3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ if test -e .svn && echo $VERSION | grep -q svn; then
   PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`"
   PACKAGE_STRING="$PACKAGE_STRING r`svnversion`"
 else if test -e .git && echo $VERSION | grep -q svn; then
-  ver=`git describe --long --all | sed 's|.*/||'`
+  ver=`git log --oneline -1 | 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/'`