From 8ad69cc9962c683a7608a59e465874131032a041 Mon Sep 17 00:00:00 2001 From: mquinson Date: Tue, 22 Dec 2009 22:27:47 +0000 Subject: [PATCH] Shorter git identification since tar don't want to deal with filenames longer than 99 chars git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6936 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/scripts/simgrid_build.functions | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/scripts/simgrid_build.functions b/buildtools/scripts/simgrid_build.functions index d028bca37c..8ae1b90a0a 100644 --- 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 06423e4b45..d14eda3a3f 100644 --- 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/'` -- 2.20.1