diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2016-09-06 10:35:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 10:35:00 (GMT) |
| commit | b38efd15eb69b2b61e05ee09fc9ed6474cc8b1da (patch) | |
| tree | 2b34368e206920ef7a92b32ce299f95238a8b0eb | |
| parent | 63af808e0c01c163a3d371818a398aa9a427740c (diff) | |
| parent | d4b0b88e189027d514fa84de75100ff1fe6e681a (diff) | |
| download | Doxygen-b38efd15eb69b2b61e05ee09fc9ed6474cc8b1da.zip Doxygen-b38efd15eb69b2b61e05ee09fc9ed6474cc8b1da.tar.gz Doxygen-b38efd15eb69b2b61e05ee09fc9ed6474cc8b1da.tar.bz2 | |
Merge pull request #517 from dallerk/plantuml_cfg
Option for PlantUML configuration file
| -rw-r--r-- | src/config.xml | 8 | ||||
| -rw-r--r-- | src/plantuml.cpp | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/config.xml b/src/config.xml index 4c13e9c..483eff1 100644 --- a/src/config.xml +++ b/src/config.xml @@ -3414,6 +3414,14 @@ to be found in the default search path. ]]> </docs> </option> + <option type='string' id='PLANTUML_CFG_FILE' format='file' defval=''> + <docs> +<![CDATA[ + When using plantuml, the \c PLANTUML_CFG_FILE tag can be used to specify a configuration + file for plantuml. +]]> + </docs> + </option> <option type='list' id='PLANTUML_INCLUDE_PATH' format='dir' defval=''> <docs> <![CDATA[ diff --git a/src/plantuml.cpp b/src/plantuml.cpp index 169968e..8e40f36 100644 --- a/src/plantuml.cpp +++ b/src/plantuml.cpp @@ -54,6 +54,7 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutputFormat format) { static QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH); + static QCString plantumlConfigFile = Config_getString(PLANTUML_CFG_FILE); QCString pumlExe = "java"; QCString pumlArgs = ""; @@ -74,6 +75,12 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp } if (pumlIncludePathList.first()) pumlArgs += "\" "; pumlArgs += "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" "; + if (plantumlConfigFile != "") + { + pumlArgs += "-config \""; + pumlArgs += plantumlConfigFile; + pumlArgs += "\" "; + } pumlArgs+="-o \""; pumlArgs+=outDir; pumlArgs+="\" "; |