Merge pull request #7118 from albert-github/feature/issue_7109

issue #7109 Doxyapp can't use "[source_file | source_dir]" parameter

2 files changed, 9 insertions, 4 deletions

diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp
index dd092ed..c18f907 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
 
+  checkConfiguration();
+  adjustConfiguration();
   // we need a place to put intermediate files
   Config_getString(OUTPUT_DIRECTORY)="/tmp/doxygen"; 
   // disable html output
@@ -281,14 +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();
 
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"):