diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-15 19:30:20 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-15 19:30:20 (GMT) |
commit | 2840a9aede8fd841d8e0602f8f093665681d4fc7 (patch) | |
tree | 37eccb20caae27b5257b3329244621d3fa7e7998 /src | |
parent | 9dad94dc6d3cb528cc7650cf07418a83ed551bdd (diff) | |
parent | e53cdd41be674e8e121b7be656eb2ab269a8d5b6 (diff) | |
download | Doxygen-2840a9aede8fd841d8e0602f8f093665681d4fc7.zip Doxygen-2840a9aede8fd841d8e0602f8f093665681d4fc7.tar.gz Doxygen-2840a9aede8fd841d8e0602f8f093665681d4fc7.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
-rw-r--r-- | src/doxygen.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 3a56ff2..f4ff579 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -7964,7 +7964,7 @@ static void generateFileSources() { QStrList filesInSameTu; fd->startParsing(); - if (fd->generateSourceFile() && !g_useOutputTemplate) // sources need to be shown in the output + if (fd->generateSourceFile() && !Htags::useHtags && !g_useOutputTemplate) // sources need to be shown in the output { msg("Generating code for file %s...\n",fd->docName().data()); fd->writeSource(*g_outputList,FALSE,filesInSameTu); @@ -7994,7 +7994,7 @@ static void generateFileSources() { QStrList filesInSameTu; fd->startParsing(); - if (fd->generateSourceFile() && !g_useOutputTemplate) // sources need to be shown in the output + if (fd->generateSourceFile() && !Htags::useHtags && !g_useOutputTemplate) // sources need to be shown in the output { msg("Generating code for file %s...\n",fd->docName().data()); fd->writeSource(*g_outputList,FALSE,filesInSameTu); @@ -11696,7 +11696,7 @@ void generateOutput() QCString htmldir = Config_getString(HTML_OUTPUT); if (!Htags::execute(htmldir)) err("USE_HTAGS is YES but htags(1) failed. \n"); - if (!Htags::loadFilemap(htmldir)) + else if (!Htags::loadFilemap(htmldir)) err("htags(1) ended normally but failed to load the filemap. \n"); } @@ -11743,12 +11743,9 @@ void generateOutput() generateExampleDocs(); g_s.end(); - if (!Htags::useHtags) - { - g_s.begin("Generating file sources...\n"); - generateFileSources(); - g_s.end(); - } + g_s.begin("Generating file sources...\n"); + generateFileSources(); + g_s.end(); g_s.begin("Generating file documentation...\n"); generateFileDocs(); |