summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles.Lee <cheoljoo@gmail.com>2018-12-26 23:11:25 (GMT)
committerCharles.Lee <cheoljoo@gmail.com>2018-12-26 23:11:25 (GMT)
commit756d8b203b67f3ab38f7d148794bb94175a064a7 (patch)
treec203e8b0f9dc7361c31e145a0345750f627d3d97
parent5d6a6eae4a3c0e6469864fb2b292a7bafe2fb6f2 (diff)
downloadDoxygen-756d8b203b67f3ab38f7d148794bb94175a064a7.zip
Doxygen-756d8b203b67f3ab38f7d148794bb94175a064a7.tar.gz
Doxygen-756d8b203b67f3ab38f7d148794bb94175a064a7.tar.bz2
JAVA_ONCE -> FAST
-rw-r--r--src/config.xml8
-rw-r--r--src/doxygen.cpp2
-rw-r--r--src/htmldocvisitor.cpp2
-rw-r--r--src/plantuml.cpp4
4 files changed, 9 insertions, 7 deletions
diff --git a/src/config.xml b/src/config.xml
index 5b1123a..e4880d4 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -3536,11 +3536,13 @@ to be found in the default search path.
]]>
</docs>
</option>
- <option type='bool' id='PLANTUML_RUN_JAVA_ONCE' defval='0'>
+ <option type='bool' id='PLANTUML_RUN_FAST' defval='0'>
<docs>
<![CDATA[
-If the \c PLANTUML_RUN_JAVA_ONCE tag is set to \c YES, doxygen will run java once for improving the performance.
-This will run once at the end of process like dot graphics processing.
+If the \c PLANTUML_RUN_FAST tag is set to \c YES, doxygen will run java once for improving the performance.
+This will run once at the end of process like dot graphics processing.
+It will remove duplicated runs when you edit a little and it will support multiple thread for multi processor.
+Finally it will reduce the doxygen running time about plantuml.
]]>
</docs>
</option>
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 7e35e67..f793f77 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -11922,7 +11922,7 @@ void generateOutput()
g_s.end();
}
- if (Config_getBool(PLANTUML_RUN_JAVA_ONCE))
+ if (Config_getBool(PLANTUML_RUN_FAST))
{
g_s.begin("Running plantuml with JAVA...\n");
PlantumlManager::instance()->run();
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index ea37cea..ab0f4d7 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -586,7 +586,7 @@ void HtmlDocVisitor::visit(DocVerbatim *s)
static QCString htmlOutput = Config_getString(HTML_OUTPUT);
QCString imgExt = getDotImageExtension();
- PlantUMLOutputFormat format = PUML_BITMAP;
+ PlantUMLOutputFormat format = PUML_BITMAP; // default : PUML_BITMAP
if (imgExt=="svg"){ format = PUML_SVG; }
QCString baseName = writePlantUMLSource(htmlOutput,s->exampleFile(),s->text(),format);
m_t << "<div class=\"plantumlgraph\">" << endl;
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index 23601f5..c6ab7af 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -79,7 +79,7 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con
file.close();
//Debug::print(Debug::Plantuml,0,"*** %s baseFileName text: %s\n","writePlantUMLSource",qPrint(text));
- if(Config_getBool(PLANTUML_RUN_JAVA_ONCE)){
+ if(Config_getBool(PLANTUML_RUN_FAST)){
QCString qcOutDir(outDir);
uint pos = qcOutDir.findRev("/");
QCString generateType(qcOutDir.right(qcOutDir.length() - (pos + 1)) );
@@ -163,7 +163,7 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp
int exitCode;
msg("Running PlantUML on generated file %s.pu\n",baseName);
portable_sysTimerStart();
- if(!Config_getBool(PLANTUML_RUN_JAVA_ONCE)){ // ! Config_getBool(PLANTUML_RUN_JAVA_ONCE)
+ if(!Config_getBool(PLANTUML_RUN_FAST)){ // ! Config_getBool(PLANTUML_RUN_FAST)
Debug::print(Debug::Plantuml,0,"*** running: %s %s outDir:%s %s\n",qPrint(pumlExe),qPrint(pumlArgs),outDir,baseName);
if ((exitCode=portable_system(pumlExe,pumlArgs,TRUE))!=0)
{