Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Option for PlantUML configuration file
  • Loading branch information
Dennis Allerkamp committed Sep 3, 2016
1 parent a19feec commit d4b0b88
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/config.xml
Expand Up @@ -3411,6 +3411,14 @@ to be found in the default search path.
java can find the \c plantuml.jar file. If left blank, it is assumed PlantUML is not used or
called during a preprocessing step. Doxygen will generate a warning when it encounters a
\ref cmdstartuml "\\startuml" command in this case and will not generate output for the diagram.
]]>
</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>
Expand Down
7 changes: 7 additions & 0 deletions src/plantuml.cpp
Expand Up @@ -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 = "";
Expand All @@ -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+="\" ";
Expand Down

0 comments on commit d4b0b88

Please sign in to comment.