From efea05e85c0481771189d6a43a19f94e6e7a3549 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 3 Mar 2009 16:43:57 +0600 Subject: Renamed function svnversion() to gitrevision() because now we uses GIT. No functional change. Signed-off-by: Slava Semushin --- src/Makefile.am | 4 ++-- src/main.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1ed1c68..24153a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,7 +54,7 @@ defaults.hh: Makefile echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \ echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \ echo 'std::string realProgramName(std::string name);'; \ - echo 'const char* svnversion(void);' ) > defaults.hh + echo 'const char* gitrevision();' ) > defaults.hh defaults.cc: force @( \ @@ -64,7 +64,7 @@ defaults.cc: force echo ' return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \ echo '}'; \ echo ''; \ - echo 'const char* svnversion(void) {'; \ + echo 'const char* gitrevision() {'; \ echo ' return "'`cat ../.git/$$(cat ../.git/HEAD | cut -f 2 -d ' ')`'";';\ echo '}' ) > defaults_tmp.cc @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi diff --git a/src/main.cc b/src/main.cc index 1cca774..32d4cc5 100644 --- a/src/main.cc +++ b/src/main.cc @@ -72,8 +72,8 @@ static void showInfo(ostream &ostr) { _FB_USES_NLS; ostr<<_FB_CONSOLETEXT(Common, FluxboxVersion, "Fluxbox version", "Fluxbox version heading")<<": "<<__fluxbox_version< 0) - ostr << _FB_CONSOLETEXT(Common, SvnRevision, "GIT Revision", "Revision number in GIT repositary") << ": " << svnversion() << endl; + if (strlen(gitrevision()) > 0) + ostr << _FB_CONSOLETEXT(Common, SvnRevision, "GIT Revision", "Revision number in GIT repositary") << ": " << gitrevision() << endl; #if defined(__DATE__) && defined(__TIME__) ostr<<_FB_CONSOLETEXT(Common, Compiled, "Compiled", "Time fluxbox was compiled")<<": "<<__DATE__<<" "<<__TIME__<