From 5edf9fe8ce764171c42c7d2ce31fbd95f2a43aff Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 11 Jul 2019 15:36:33 +0200 Subject: issue #7109 Doxyapp can't use "[source_file | source_dir]" parameter - initialization has to be done in an earlier stage (and only once) - not only the INPUT tag was involved, none of the tags were set. --- addon/doxyapp/doxyapp.cpp | 3 +++ src/configgen.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp index dd092ed..f2cfa78 100644 --- a/addon/doxyapp/doxyapp.cpp +++ b/addon/doxyapp/doxyapp.cpp @@ -261,6 +261,8 @@ int main(int argc,char **argv) // setup the non-default configuration options + Config::postProcess(FALSE); + ConfigValues::instance().init(); // we need a place to put intermediate files Config_getString(OUTPUT_DIRECTORY)="/tmp/doxygen"; // disable html output @@ -283,6 +285,7 @@ int main(int argc,char **argv) Config_getBool(SOURCE_BROWSER)=TRUE; // set the input + Config_getList(INPUT).clear(); Config_getList(INPUT).append(argv[1]); // check and finialize the configuration diff --git a/src/configgen.py b/src/configgen.py index ca2a5d1..dbba264 100755 --- a/src/configgen.py +++ b/src/configgen.py @@ -717,6 +717,10 @@ def main(): print("") print("void ConfigValues::init()") print("{") + print(" static bool first = TRUE;") + print(" if (!first) return;") + print(" first = FALSE;") + print("") for n in elem.childNodes: if n.nodeType == Node.ELEMENT_NODE: if (n.nodeName == "group"): -- cgit v0.12 From 577e7844a7fd60cfc4e2f0e7b3bff6ba3e368368 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 13 Jul 2019 13:54:33 +0200 Subject: issue #7109 Doxyapp can't use "[source_file | source_dir]" parameter - setting RECURSIVE (required for directories) - making check / adjust consistent with doxyparse --- addon/doxyapp/doxyapp.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp index f2cfa78..c18f907 100644 --- a/addon/doxyapp/doxyapp.cpp +++ b/addon/doxyapp/doxyapp.cpp @@ -261,8 +261,8 @@ int main(int argc,char **argv) // setup the non-default configuration options - Config::postProcess(FALSE); - ConfigValues::instance().init(); + checkConfiguration(); + adjustConfiguration(); // we need a place to put intermediate files Config_getString(OUTPUT_DIRECTORY)="/tmp/doxygen"; // disable html output @@ -283,15 +283,13 @@ int main(int argc,char **argv) // Extract source browse information, needed // to make doxygen gather the cross reference info Config_getBool(SOURCE_BROWSER)=TRUE; + // In case of a directory take all files on directory and its subdirectories + Config_getBool(RECURSIVE)=TRUE; // set the input Config_getList(INPUT).clear(); Config_getList(INPUT).append(argv[1]); - // check and finialize the configuration - checkConfiguration(); - adjustConfiguration(); - // parse the files parseInput(); -- cgit v0.12