aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Semushin <php-coder@altlinux.ru>2009-03-03 10:43:57 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2009-03-04 20:41:39 (GMT)
commitefea05e85c0481771189d6a43a19f94e6e7a3549 (patch)
treeb060c627e326145bc8e76f26e189383674ae16a3
parent925fb1774deedc2c4b674b8deb4f567da0e31473 (diff)
downloadfluxbox_paul-efea05e85c0481771189d6a43a19f94e6e7a3549.zip
fluxbox_paul-efea05e85c0481771189d6a43a19f94e6e7a3549.tar.bz2
Renamed function svnversion() to gitrevision() because now we uses GIT.
No functional change. Signed-off-by: Slava Semushin <php-coder@altlinux.ru>
-rw-r--r--src/Makefile.am4
-rw-r--r--src/main.cc4
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
54 echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \ 54 echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
55 echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \ 55 echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
56 echo 'std::string realProgramName(std::string name);'; \ 56 echo 'std::string realProgramName(std::string name);'; \
57 echo 'const char* svnversion(void);' ) > defaults.hh 57 echo 'const char* gitrevision();' ) > defaults.hh
58 58
59defaults.cc: force 59defaults.cc: force
60 @( \ 60 @( \
@@ -64,7 +64,7 @@ defaults.cc: force
64 echo ' return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \ 64 echo ' return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
65 echo '}'; \ 65 echo '}'; \
66 echo ''; \ 66 echo ''; \
67 echo 'const char* svnversion(void) {'; \ 67 echo 'const char* gitrevision() {'; \
68 echo ' return "'`cat ../.git/$$(cat ../.git/HEAD | cut -f 2 -d ' ')`'";';\ 68 echo ' return "'`cat ../.git/$$(cat ../.git/HEAD | cut -f 2 -d ' ')`'";';\
69 echo '}' ) > defaults_tmp.cc 69 echo '}' ) > defaults_tmp.cc
70 @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi 70 @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) {
72 _FB_USES_NLS; 72 _FB_USES_NLS;
73 ostr<<_FB_CONSOLETEXT(Common, FluxboxVersion, "Fluxbox version", "Fluxbox version heading")<<": "<<__fluxbox_version<<endl; 73 ostr<<_FB_CONSOLETEXT(Common, FluxboxVersion, "Fluxbox version", "Fluxbox version heading")<<": "<<__fluxbox_version<<endl;
74 74
75 if (strlen(svnversion()) > 0) 75 if (strlen(gitrevision()) > 0)
76 ostr << _FB_CONSOLETEXT(Common, SvnRevision, "GIT Revision", "Revision number in GIT repositary") << ": " << svnversion() << endl; 76 ostr << _FB_CONSOLETEXT(Common, SvnRevision, "GIT Revision", "Revision number in GIT repositary") << ": " << gitrevision() << endl;
77#if defined(__DATE__) && defined(__TIME__) 77#if defined(__DATE__) && defined(__TIME__)
78 ostr<<_FB_CONSOLETEXT(Common, Compiled, "Compiled", "Time fluxbox was compiled")<<": "<<__DATE__<<" "<<__TIME__<<endl; 78 ostr<<_FB_CONSOLETEXT(Common, Compiled, "Compiled", "Time fluxbox was compiled")<<": "<<__DATE__<<" "<<__TIME__<<endl;
79#endif 79#endif