scottk/wlan-cloud-lib-poco
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-lib-poco.git synced 2025-11-01 19:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

PocoDoc fixes

Browse Source
This commit is contained in:
Guenter Obiltschnig
2017-11-11 15:53:34 +01:00
parent b92e98b7df
commit c88f0f2731
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
PocoDoc/cfg/mkdoc.xml → PocoDoc/cfg/mkdoc-gradle.xml
View File

19
PocoDoc/src/PocoDoc.cpp
View File

@@ -227,21 +227,10 @@ protected:
else else
platformComp += ".unix"; platformComp += ".unix";
std::string exec; std::string exec = config().getString(platformComp + ".exec", config().getString(comp + ".exec", ""));
std::string opts; std::string opts = config().getString(platformComp + ".options", config().getString(comp + ".options", ""));
std::string path; std::string path = config().getString(platformComp + ".path", config().getString(comp + ".path", ""));
bool usePipe; bool usePipe = config().getBool(platformComp + ".usePipe", config().getBool(comp + ".usePipe", false));
try {
exec = config().getString(comp + ".exec");
opts = config().getString(comp + ".options");
path = config().getString(comp + ".path", "");
usePipe = config().getBool(comp + ".usePipe", false);
} catch (Poco::NotFoundException&) {
exec = config().getString(platformComp + ".exec");
opts = config().getString(platformComp + ".options");
path = config().getString(platformComp + ".path", "");
usePipe = config().getBool(platformComp + ".usePipe", false);
}
std::string popts; std::string popts;
for (std::string::const_iterator it = opts.begin(); it != opts.end(); ++it) for (std::string::const_iterator it = opts.begin(); it != opts.end(); ++it)

8
build.gradle
View File

@@ -753,24 +753,24 @@ task pocoDoc(type: Exec) {
if (os.windows) { if (os.windows) {
environment "Path", "$rootDir\\bin;$Path" environment "Path", "$rootDir\\bin;$Path"
executable "PocoDoc/bin/PocoDoc.exe" executable "PocoDoc/bin/PocoDoc.exe"
args "/config=$rootDir/PocoDoc/cfg/mkdoc.xml" args "/config=$rootDir/PocoDoc/cfg/mkdoc-gradle.xml"
args "/config=$rootDir/PocoDoc/PocoDoc.ini" args "/config=$rootDir/PocoDoc/PocoDoc.ini"
} }
if (os.linux) { if (os.linux) {
environment "LD_LIBRARY_PATH", "$rootDir/lib64:$LD_LIBRARY_PATH" environment "LD_LIBRARY_PATH", "$rootDir/lib64:$LD_LIBRARY_PATH"
executable "PocoDoc/bin64/PocoDoc" executable "PocoDoc/bin64/PocoDoc"
args "-config=$rootDir/PocoDoc/cfg/mkdoc.xml" args "-config=$rootDir/PocoDoc/cfg/mkdoc-gradle.xml"
args "-config=$rootDir/PocoDoc/PocoDoc.ini" args "-config=$rootDir/PocoDoc/PocoDoc.ini"
} }
if (os.macOsX) { if (os.macOsX) {
//FIXME environment "LD_LIBRARY_PATH", "$rootDir/bin:$LD_LIBRARY_PATH" //FIXME environment "LD_LIBRARY_PATH", "$rootDir/bin:$LD_LIBRARY_PATH"
args "-config=$rootDir/PocoDoc/cfg/mkdoc.xml" args "-config=$rootDir/PocoDoc/cfg/mkdoc-gradle.xml"
args "-config=$rootDir/PocoDoc/PocoDoc.ini" args "-config=$rootDir/PocoDoc/PocoDoc.ini"
} }
// inputs.files(tasks.getByPath(':production').outputs.files) // inputs.files(tasks.getByPath(':production').outputs.files)
inputs.files(executable) inputs.files(executable)
inputs.files(fileTree("doc").filter { it.isFile() }) inputs.files(fileTree("doc").filter { it.isFile() })
inputs.files(new File("$rootDir/PocoDoc/cfg/mkdoc.xml")) inputs.files(new File("$rootDir/PocoDoc/cfg/mkdoc-gradle.xml"))
outputs.files(new File("releases/$version-all-doc/index.html")) outputs.files(new File("releases/$version-all-doc/index.html"))
} }
task zipDoc(type: Zip) { task zipDoc(type: Zip) {