diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-20 23:21:48 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-01-20 23:31:08 +0100 |
| commit | a237e7f860bb4705823077e90b2ecc599746e46c (patch) | |
| tree | 9eb68c4472459472258c9d3edf7417ddc6163fdc | |
| parent | 07a3bef25ca737bccb04d2d8d16923ddd2ab162b (diff) | |
| download | mpd-a237e7f860bb4705823077e90b2ecc599746e46c.tar.gz mpd-a237e7f860bb4705823077e90b2ecc599746e46c.tar.xz mpd-a237e7f860bb4705823077e90b2ecc599746e46c.zip | |
CommandLine: show the current git tag and commit id
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/CommandLine.cxx | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 71fdb0e1d..52db236ba 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,10 @@ AC_CONFIG_MACRO_DIR([m4]) AC_DEFINE(PROTOCOL_VERSION, "0.19.0", [The MPD protocol version]) +GIT_COMMIT=`GIT_DIR="$srcdir/.git" git describe --dirty --always 2>/dev/null` +if test x$GIT_COMMIT != x; then + AC_DEFINE_UNQUOTED(GIT_COMMIT, ["$GIT_COMMIT"], [The current git commit]) +fi dnl --------------------------------------------------------------------------- dnl Programs diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 59cb53534..33f4917c0 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -88,7 +88,11 @@ static constexpr Domain cmdline_domain("cmdline"); gcc_noreturn static void version(void) { - puts("Music Player Daemon " VERSION "\n" + puts("Music Player Daemon " VERSION +#ifdef GIT_COMMIT + " (" GIT_COMMIT ")" +#endif + "\n" "\n" "Copyright (C) 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n" "Copyright (C) 2008-2014 Max Kellermann <max@duempel.org>\n" |