diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2010-09-20 18:19:55 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2010-09-20 18:19:55 (GMT) |
commit | a80f9320bf9fdd879869cee2cea1ec3f9af822f8 (patch) | |
tree | c3964e8a42bc4dfecf5a99d6de94650878e67a0f /src/msc.cpp | |
parent | ce8facca2c23f4656747ad3a5b4a8db475855e27 (diff) | |
download | Doxygen-a80f9320bf9fdd879869cee2cea1ec3f9af822f8.zip Doxygen-a80f9320bf9fdd879869cee2cea1ec3f9af822f8.tar.gz Doxygen-a80f9320bf9fdd879869cee2cea1ec3f9af822f8.tar.bz2 |
Release-1.7.1-20100920
Diffstat (limited to 'src/msc.cpp')
-rw-r--r-- | src/msc.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/msc.cpp b/src/msc.cpp index 87ec5d3..a60ce90 100644 --- a/src/msc.cpp +++ b/src/msc.cpp @@ -112,11 +112,17 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir, } mscArgs+=" -i \""; mscArgs+=inFile; - mscArgs+=".msc\" -o \""; + + if (QCString(inFile).right(4)!=".msc") // add extension if not given + { + mscArgs+=".msc"; + } + mscArgs+="\" -o \""; + mscArgs+=outFile; mscArgs+=extension+"\""; int exitCode; - //printf("*** running: %s %s\n",mscExe.data(),mscArgs.data()); +// printf("*** running: %s %s outDir:%s %s\n",mscExe.data(),mscArgs.data(),outDir,outFile); portable_sysTimerStart(); if ((exitCode=portable_system(mscExe,mscArgs,FALSE))!=0) { @@ -146,6 +152,8 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir, { QCString outFile = inFile + ".map"; + + //printf("*** running:getMscImageMapFromFile \n"); // chdir to the output dir, so dot can find the font file. QCString oldDir = convertToQCString(QDir::currentDirPath()); // go to the html output directory (i.e. path) @@ -154,7 +162,12 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir, QCString mscExe = Config_getString("MSCGEN_PATH")+"mscgen"+portable_commandExtension(); QCString mscArgs = "-T ismap -i \""; - mscArgs+=inFile + ".msc\" -o \""; + mscArgs+=inFile; + if (QCString(inFile).right(4)!=".msc") // add extension if not given + { + mscArgs+=".msc"; + } + mscArgs+="\" -o \""; mscArgs+=outFile + "\""; int exitCode; |