nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed function svnversion() to gitrevision() because now we uses GIT.

Browse source 
No functional change.

Signed-off-by: Slava Semushin <php-coder@altlinux.ru>
This commit is contained in:
Slava Semushin 2009-03-03 16:43:57 +06:00 committed by Mathias Gumz
parent 925fb1774d
commit efea05e85c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile.am
View file

@ -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

4
src/main.cc
View file

@ -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