kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-23 03:52:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ kiwix-launcher able to launch system xulrunner binary

Browse Source
This commit is contained in:
kelson42 2014-05-29 22:52:11 +02:00
parent 9ec15ba891
commit 461aa5c1f9
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/launcher/kiwix-launcher.cpp
View File

@ -98,17 +98,29 @@ int main(int argc, char *argv[]) {
}
/* Find xulrunner (binary) path */
std::vector<std::string> xulrunnerPossibleNames;
xulrunnerPossibleNames.push_back(std::string("xulrunner") + std::string(EXEXT));
xulrunnerPossibleNames.push_back(std::string("xulrunner-bin") + std::string(EXEXT));
xulrunnerPossibleNames.push_back(std::string("xulrunner-") + std::string(GECKO_VERSION));
xulrunnerPossibleNames.push_back(std::string("xulrunner-") + std::string(GECKO_VERSION) +
std::string(".0"));
xulrunnerPossibleNames.push_back(std::string("xulrunner-") + std::string(MAJOR_GECKO_VERSION));
xulrunnerPossibleNames.push_back(std::string("xulrunner-") + std::string(MINOR_GECKO_VERSION));
std::vector<std::string>::iterator filesIt;
string xulrunnerPath;
directoriesIt = xulrunnerPossibleDirectories.begin();
while (xulrunnerPath.empty() && directoriesIt != xulrunnerPossibleDirectories.end()) {
if (fileExists(*directoriesIt)) {
xulrunnerPath = computeAbsolutePath(*directoriesIt, std::string("xulrunner-bin") + std::string(EXEXT));
if (!fileExists(xulrunnerPath)) {
xulrunnerPath = computeAbsolutePath(*directoriesIt, std::string("xulrunner") + std::string(EXEXT));
filesIt = xulrunnerPossibleNames.begin();
while (xulrunnerPath.empty() &&
filesIt != xulrunnerPossibleNames.end()) {
xulrunnerPath = computeAbsolutePath(*directoriesIt, *filesIt);
if (!fileExists(xulrunnerPath)) {
xulrunnerPath.clear();
}
}
filesIt++;
};
}
directoriesIt++;
}
@ -134,7 +146,7 @@ int main(int argc, char *argv[]) {
"kiwix-windows/application.ini"));
string applicationIniPath;
std::vector<std::string>::iterator filesIt = applicationIniPossiblePaths.begin();
filesIt = applicationIniPossiblePaths.begin();
while (applicationIniPath.empty() &&
filesIt != applicationIniPossiblePaths.end()) {
if (fileExists(*filesIt)) {