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/configimpl.l | |
| 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/configimpl.l')
| -rw-r--r-- | src/configimpl.l | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/configimpl.l b/src/configimpl.l index bc08cbf..72c826d 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -943,7 +943,7 @@ void ConfigImpl::writeTemplate(FTextStream &t,bool sl,bool upd) { t << takeStartComment() << endl; } - t << "# Doxyfile " << versionString << endl << endl; + t << "# Doxyfile " << getVersion() << endl << endl; if (!sl) { t << convertToComment(m_header,""); @@ -964,7 +964,12 @@ void ConfigImpl::writeTemplate(FTextStream &t,bool sl,bool upd) void ConfigImpl::compareDoxyfile(FTextStream &t) { - t << "# Difference with default Doxyfile " << versionString << endl; + t << "# Difference with default Doxyfile " << getVersion(); + if (strlen(getGitVersion())) + { + t << " (" << getGitVersion() << ")"; + } + t << endl; QListIterator<ConfigOption> it = iterator(); ConfigOption *option; for (;(option=it.current());++it) |