Renamed function svnversion() to gitrevision() because now we uses GIT. No functional change. Signed-off-by: Slava Semushin <php-coder@altlinux.ru>
Slava Semushin php-coder@altlinux.ru
2 files changed,
4 insertions(+),
4 deletions(-)
M
src/Makefile.am
→
src/Makefile.am
@@ -54,7 +54,7 @@ echo '#define DEFAULT_WINDOWMENU "$(DEFAULT_WINDOWMENU)"'; \
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 @@ echo 'std::string realProgramName(std::string name) {'; \
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
M
src/main.cc
→
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<<endl; - if (strlen(svnversion()) > 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__<<endl; #endif