summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Allerkamp <git@dennis-allerkamp.de>2016-09-03 12:14:34 (GMT)
committerDennis Allerkamp <git@dennis-allerkamp.de>2016-09-03 12:14:34 (GMT)
commitd4b0b88e189027d514fa84de75100ff1fe6e681a (patch)
tree479d1b8378bab2cf600f26ec3c6a7454a1bbc894
parenta19feec4a7864dc17fcb570330ae2f7b9a5c6e45 (diff)
downloadDoxygen-d4b0b88e189027d514fa84de75100ff1fe6e681a.zip
Doxygen-d4b0b88e189027d514fa84de75100ff1fe6e681a.tar.gz
Doxygen-d4b0b88e189027d514fa84de75100ff1fe6e681a.tar.bz2
Option for PlantUML configuration file
-rw-r--r--src/config.xml8
-rw-r--r--src/plantuml.cpp7
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+="\" ";