Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:08:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #8731 from huffman/feat/interface-run-server

Browse source 
Add flag to interface to have it start the sandbox server
This commit is contained in:
Chris Collins 2016-10-06 09:18:41 -07:00 committed by GitHub
commit 80ecf88935
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
interface/src/main.cpp
View file

@ -29,6 +29,7 @@
#include "InterfaceLogging.h" #include "InterfaceLogging.h"
#include "UserActivityLogger.h" #include "UserActivityLogger.h"
#include "MainWindow.h" #include "MainWindow.h"
#include <QtCore/QProcess>
#ifdef HAS_BUGSPLAT #ifdef HAS_BUGSPLAT
#include <BuildInfo.h> #include <BuildInfo.h>
@ -121,6 +122,29 @@ int main(int argc, const char* argv[]) {
} }
} }
QCommandLineParser parser;
QCommandLineOption runServerOption("runServer", "Whether to run the server");
QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath");
parser.addOption(runServerOption);
parser.addOption(serverContentPathOption);
parser.parse(arguments);
if (parser.isSet(runServerOption)) {
QString applicationDirPath = QFileInfo(arguments[0]).path();
QString serverPath = applicationDirPath + "/server-console/server-console.exe";
qDebug() << "Application dir path is: " << applicationDirPath;
qDebug() << "Server path is: " << serverPath;
QStringList args;
if (parser.isSet(serverContentPathOption)) {
QString serverContentPath = QFileInfo(arguments[0]).path() + "/" + parser.value(serverContentPathOption);
args << "--" << "--contentPath" << serverContentPath;
}
qDebug() << QFileInfo(arguments[0]).path();
qDebug() << QProcess::startDetached(serverPath, args);
// Sleep a short amount of time to give the server a chance to start
usleep(2000000);
}
QElapsedTimer startupTime; QElapsedTimer startupTime;
startupTime.start(); startupTime.start();