mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string

Browse Source
This commit is contained in:
Alexander Bock
2021-05-17 00:23:15 +02:00
parent ccdc5a5dc3
commit 92432caed2
102 changed files with 431 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/webgui/webguimodule.cpp
+6 -6
View File
@@ -244,9 +244,9 @@ void WebGuiModule::startProcess() {
#ifdef _MSC_VER
const std::string nodePath = absPath("${MODULE_WEBGUI}/ext/nodejs/node.exe");
const std::filesystem::path node = absPath("${MODULE_WEBGUI}/ext/nodejs/node.exe");
#else
const std::string nodePath = absPath("${MODULE_WEBGUI}/ext/nodejs/node");
const std::filesystem::path node = absPath("${MODULE_WEBGUI}/ext/nodejs/node");
#endif
std::string formattedDirectories = "[";
@@ -255,7 +255,7 @@ void WebGuiModule::startProcess() {
for (size_t i = 0; i < directories.size(); ++i) {
std::string arg = directories[i];
if (i & 1) {
arg = absPath(arg);
arg = absPath(arg).string();
}
formattedDirectories += "\\\"" + escapedJson(escapedJson(arg)) + "\\\"";
if (i != directories.size() - 1) {
@@ -268,8 +268,8 @@ void WebGuiModule::startProcess() {
"" :
" --redirect \"" + _defaultEndpoint.value() + "\"";
const std::string command = "\"" + nodePath + "\" "
+ "\"" + absPath(_entryPoint.value()) + "\"" +
const std::string command = "\"" + node.string() + "\" "
+ "\"" + absPath(_entryPoint.value()).string() + "\"" +
" --directories \"" + formattedDirectories + "\"" +
defaultEndpoint +
" --http-port \"" + std::to_string(_port.value()) + "\" " +
@@ -279,7 +279,7 @@ void WebGuiModule::startProcess() {
_process = std::make_unique<ghoul::Process>(
command,
absPath("${BIN}"),
absPath("${BIN}").string(),
[](const char* data, size_t n) {
const std::string str(data, n);
LDEBUG(fmt::format("Web GUI server output: {}", str));