From 55b9670ad840bb05b02b29bbc13ae87803bb8b27 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 1 Sep 2010 12:37:38 -0400 Subject: [PATCH] Oops, my svn/git autodetection logic is still broken. Fixed. (cherry picked from commit ea36c3b92b59412eb3d74ab248f2c371d254dc06) --- citadel/scripts/mk_svn_revision.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/citadel/scripts/mk_svn_revision.sh b/citadel/scripts/mk_svn_revision.sh index a325bf334..cb8af4e04 100755 --- a/citadel/scripts/mk_svn_revision.sh +++ b/citadel/scripts/mk_svn_revision.sh @@ -12,7 +12,6 @@ CUR_DIR=`pwd` C_FILE="$CUR_DIR/svn_revision.c" H_FILE="$CUR_DIR/svn_revision.h" - # determine if this code base came from subversion. if test -d $SRC_DIR/.svn ; then echo "have subversion repository" @@ -24,7 +23,7 @@ if test -d $SRC_DIR/.svn ; then CAN_BUILD_SVN_REVISION="yes" fi else - if test -d $SRC_DIR/../.svn ; then + if test -d $SRC_DIR/../.git ; then echo "have Git repository." BUILD=`/usr/bin/git log -1 --pretty=%H . ` echo "This code base git-revision: $BUILD" @@ -71,7 +70,7 @@ cat < $C_FILE const char *svn_revision (void) { - const char *SVN_Version = "**UNKNOWN** Built from source without svn and no $C_FILE accompanying"; + const char *SVN_Version = "(unknown)"; return SVN_Version; } EOF -- 2.30.2