diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-07-30 12:59:58 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-07-30 12:59:58 (GMT) |
commit | 3c47ea4ff918a63eb3a3e5f67354b6975c839743 (patch) | |
tree | dccdf5b5583256944297866d990b165b5f504c82 /src/doxygen.cpp | |
parent | 869602993d389ae85994aae17db26940cc44f0cf (diff) | |
parent | cb1ef441b2a4d21cf67a59fe8e57613ba3552051 (diff) | |
download | Doxygen-3c47ea4ff918a63eb3a3e5f67354b6975c839743.zip Doxygen-3c47ea4ff918a63eb3a3e5f67354b6975c839743.tar.gz Doxygen-3c47ea4ff918a63eb3a3e5f67354b6975c839743.tar.bz2 |
Merge branch 'feature/bug_gitversion' of https://github.com/albert-github/doxygen into albert-github-feature/bug_gitversion
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 0d05f13..92e5292 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -10129,7 +10129,14 @@ static void devUsage() static void usage(const char *name) { - msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2015\n\n",versionString); + if (strlen(getGitVersion())) + { + msg("Doxygen version %s (%s)\nCopyright Dimitri van Heesch 1997-2015\n\n",getVersion(),getGitVersion()); + } + else + { + msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2015\n\n",getVersion()); + } msg("You can use doxygen in a number of ways:\n\n"); msg("1) Use doxygen to generate a template configuration file:\n"); msg(" %s [-s] -g [configName]\n\n",name); @@ -10589,7 +10596,14 @@ void readConfiguration(int argc, char **argv) g_dumpSymbolMap = TRUE; break; case 'v': - msg("%s\n",versionString); + if (strlen(getGitVersion())) + { + msg("%s (%s)\n",getVersion(),getGitVersion()); + } + else + { + msg("%s\n",getVersion()); + } cleanUpDoxygen(); exit(0); break; @@ -10601,7 +10615,14 @@ void readConfiguration(int argc, char **argv) } else if (qstrcmp(&argv[optind][2],"version")==0) { - msg("%s\n",versionString); + if (strlen(getGitVersion())) + { + msg("%s (%s)\n",getVersion(),getGitVersion()); + } + else + { + msg("%s\n",getVersion()); + } cleanUpDoxygen(); exit(0); } |