diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2014-09-16 19:35:43 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-09-16 19:35:43 (GMT) |
commit | 2eece646faff22eeb256cd67b9af424401be2e41 (patch) | |
tree | 59b27c03b48ac6fbf40d3f7f774671ebb1d08e56 /src | |
parent | c9a69180f6e47090249711b11fe9c46e42846b88 (diff) | |
parent | bbb6bb217a2feb7b9b961037072f06ff1024a0ef (diff) | |
download | Doxygen-2eece646faff22eeb256cd67b9af424401be2e41.zip Doxygen-2eece646faff22eeb256cd67b9af424401be2e41.tar.gz Doxygen-2eece646faff22eeb256cd67b9af424401be2e41.tar.bz2 |
Merge pull request #226 from albert-github/feature/plantuml_include
Support plantuml !include statement
Diffstat (limited to 'src')
-rw-r--r-- | src/config.xml | 8 | ||||
-rw-r--r-- | src/plantuml.cpp | 19 |
2 files changed, 26 insertions, 1 deletions
diff --git a/src/config.xml b/src/config.xml index 670ebaf..fb3b1de 100644 --- a/src/config.xml +++ b/src/config.xml @@ -3314,6 +3314,14 @@ to be found in the default search path. ]]> </docs> </option> + <option type='list' id='PLANTUML_INCLUDE_PATH' format='dir' defval='' depends='HAVE_DOT'> + <docs> +<![CDATA[ + When using plantuml, the specified paths are searched for files specified by the \c !include + statement in a plantuml block. +]]> + </docs> + </option> <option type='int' id='DOT_GRAPH_MAX_NODES' minval='0' maxval='10000' defval='50' depends='HAVE_DOT'> <docs> <![CDATA[ diff --git a/src/plantuml.cpp b/src/plantuml.cpp index f14ab15..5e5bd98 100644 --- a/src/plantuml.cpp +++ b/src/plantuml.cpp @@ -56,7 +56,24 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp static QCString plantumlJarPath = Config_getString("PLANTUML_JAR_PATH"); QCString pumlExe = "java"; - QCString pumlArgs = "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" "; + QCString pumlArgs = ""; + + QStrList &pumlIncludePathList = Config_getList("PLANTUML_INCLUDE_PATH"); + char *s=pumlIncludePathList.first(); + if (s) + { + pumlArgs += "-Dplantuml.include.path=\""; + pumlArgs += s; + s = pumlIncludePathList.next(); + } + while (s) + { + pumlArgs += portable_pathListSeparator(); + pumlArgs += s; + s = pumlIncludePathList.next(); + } + if (pumlIncludePathList.first()) pumlArgs += "\" "; + pumlArgs += "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" "; pumlArgs+="-o \""; pumlArgs+=outDir; pumlArgs+="\" "; |