Permalink
Browse files

Copy user EXTRA_FILES at the end to overrule files generated by defau…

…lt by doxygen

In case the user wants to overrule by means of a HTML_EXTRA_FILIES or LATEX_EXTRA_FILES a default file from doxygen (e.g. a logo or arrowdown) this is not directly possible as the files are again overwritten by doxygen.
Placing the copy commands at the end and in this list the generateTreeViewImages before the the user files a user can overrule default doxygen files
  • Loading branch information...
albert-github committed Jun 14, 2015
1 parent f415b62 commit 82f08138ad08fa5b8906c162283c4df0e9819d83
Showing with 14 additions and 10 deletions.
  1. +14 −10 src/doxygen.cpp
View
@@ -11439,21 +11439,11 @@ void generateOutput()
if (generateDocSet) Doxygen::indexList->addIndex(new DocSets);
Doxygen::indexList->initialize();
HtmlGenerator::writeTabData();
// copy static stuff
copyStyleSheet();
copyLogo();
copyExtraFiles("HTML_EXTRA_FILES","HTML_OUTPUT");
FTVHelp::generateTreeViewImages();
}
if (generateLatex)
{
g_outputList->add(new LatexGenerator);
LatexGenerator::init();
copyLatexStyleSheet();
// copy static stuff
copyExtraFiles("LATEX_EXTRA_FILES","LATEX_OUTPUT");
}
if (generateMan)
{
@@ -11675,6 +11665,20 @@ void generateOutput()
g_s.end();
}
// copy static stuff
if (generateHtml)
{
FTVHelp::generateTreeViewImages();
copyStyleSheet();
copyLogo();
copyExtraFiles("HTML_EXTRA_FILES","HTML_OUTPUT");
}
if (generateLatex)
{
copyLatexStyleSheet();
copyExtraFiles("LATEX_EXTRA_FILES","LATEX_OUTPUT");
}
if (generateHtml &&
Config_getBool("GENERATE_HTMLHELP") &&
!Config_getString("HHC_LOCATION").isEmpty())

0 comments on commit 82f0813

Please sign in to comment.