summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2015-06-14 16:05:24 (GMT)
committeralbert-github <albert.tests@gmail.com>2015-06-14 16:05:24 (GMT)
commit82f08138ad08fa5b8906c162283c4df0e9819d83 (patch)
tree2fce1656d781d714c6470c93561987de07274926
parentf415b624a6cf6b9e577ec6131a23cb4a0e830aaf (diff)
downloadDoxygen-82f08138ad08fa5b8906c162283c4df0e9819d83.zip
Doxygen-82f08138ad08fa5b8906c162283c4df0e9819d83.tar.gz
Doxygen-82f08138ad08fa5b8906c162283c4df0e9819d83.tar.bz2
Copy user EXTRA_FILES at the end to overrule files generated by default 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
-rw-r--r--src/doxygen.cpp24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 647b5c8..918cf82 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -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())