mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 06:38:29 +02:00
Change strings, comments and folders to Vircadia
This commit is contained in:
parent
bc249abe48
commit
dce34b8d90
10 changed files with 60 additions and 60 deletions
|
@ -121,14 +121,14 @@ if (APPLE)
|
||||||
# configure CMake to use a custom Info.plist
|
# configure CMake to use a custom Info.plist
|
||||||
set_target_properties(${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in)
|
set_target_properties(${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in)
|
||||||
|
|
||||||
set(MACOSX_BUNDLE_BUNDLE_NAME "High Fidelity")
|
set(MACOSX_BUNDLE_BUNDLE_NAME "Vircadia")
|
||||||
if (PRODUCTION_BUILD)
|
if (PRODUCTION_BUILD)
|
||||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.interface)
|
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface)
|
||||||
else ()
|
else ()
|
||||||
if (DEV_BUILD)
|
if (DEV_BUILD)
|
||||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.interface-dev)
|
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-dev)
|
||||||
elseif (PR_BUILD)
|
elseif (PR_BUILD)
|
||||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.interface-pr)
|
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-pr)
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|
|
@ -143,13 +143,13 @@ set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
|
||||||
include(CPackComponent)
|
include(CPackComponent)
|
||||||
|
|
||||||
set(CPACK_PACKAGE_NAME "HQ Launcher")
|
set(CPACK_PACKAGE_NAME "HQ Launcher")
|
||||||
set(CPACK_PACKAGE_VENDOR "High Fidelity")
|
set(CPACK_PACKAGE_VENDOR "Vircadia")
|
||||||
set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
|
set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
|
||||||
set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")
|
set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")
|
||||||
|
|
||||||
set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
|
set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
|
||||||
|
|
||||||
set(DMG_SUBFOLDER_NAME "High Fidelity")
|
set(DMG_SUBFOLDER_NAME "Vircadia")
|
||||||
set(ESCAPED_DMG_SUBFOLDER_NAME "")
|
set(ESCAPED_DMG_SUBFOLDER_NAME "")
|
||||||
set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc")
|
set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc")
|
||||||
|
|
||||||
|
|
|
@ -276,12 +276,12 @@ if (APPLE)
|
||||||
include(CPackComponent)
|
include(CPackComponent)
|
||||||
|
|
||||||
set(CPACK_PACKAGE_NAME "HQ Launcher")
|
set(CPACK_PACKAGE_NAME "HQ Launcher")
|
||||||
set(CPACK_PACKAGE_VENDOR "High Fidelity")
|
set(CPACK_PACKAGE_VENDOR "Vircadia")
|
||||||
set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")
|
set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")
|
||||||
|
|
||||||
set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
|
set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
|
||||||
|
|
||||||
set(DMG_SUBFOLDER_NAME "High Fidelity")
|
set(DMG_SUBFOLDER_NAME "Vircadia")
|
||||||
set(ESCAPED_DMG_SUBFOLDER_NAME "")
|
set(ESCAPED_DMG_SUBFOLDER_NAME "")
|
||||||
set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc")
|
set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc")
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.3
|
||||||
import QtQuick 2.1
|
import QtQuick 2.1
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
text: "High Fidelity"
|
text: "Vircadia"
|
||||||
font.bold: true
|
font.bold: true
|
||||||
font.family: "Graphik Semibold"
|
font.family: "Graphik Semibold"
|
||||||
font.pixelSize: 17
|
font.pixelSize: 17
|
||||||
|
|
|
@ -21,7 +21,7 @@ Launcher::Launcher(int& argc, char**argv) : QGuiApplication(argc, argv) {
|
||||||
_launcherWindow->rootContext()->setContextProperty("LauncherState", _launcherState.get());
|
_launcherWindow->rootContext()->setContextProperty("LauncherState", _launcherState.get());
|
||||||
_launcherWindow->rootContext()->setContextProperty("PathUtils", new PathUtils());
|
_launcherWindow->rootContext()->setContextProperty("PathUtils", new PathUtils());
|
||||||
_launcherWindow->rootContext()->setContextProperty("Platform", platform);
|
_launcherWindow->rootContext()->setContextProperty("Platform", platform);
|
||||||
_launcherWindow->setTitle("High Fidelity");
|
_launcherWindow->setTitle("Vircadia");
|
||||||
_launcherWindow->setFlags(Qt::FramelessWindowHint | Qt::Window);
|
_launcherWindow->setFlags(Qt::FramelessWindowHint | Qt::Window);
|
||||||
_launcherWindow->setLauncherStatePtr(_launcherState);
|
_launcherWindow->setLauncherStatePtr(_launcherState);
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QTime>
|
#include <QTime>
|
||||||
|
|
||||||
|
@ -253,7 +253,7 @@ void LauncherInstaller::createApplicationRegistryKeys() {
|
||||||
success = insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath);
|
success = insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath);
|
||||||
success = insertRegistryKey(REGISTRY_PATH, "DisplayVersion", std::string(LAUNCHER_BUILD_VERSION));
|
success = insertRegistryKey(REGISTRY_PATH, "DisplayVersion", std::string(LAUNCHER_BUILD_VERSION));
|
||||||
success = insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe);
|
success = insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe);
|
||||||
success = insertRegistryKey(REGISTRY_PATH, "Publisher", "High Fidelity");
|
success = insertRegistryKey(REGISTRY_PATH, "Publisher", "Vircadia");
|
||||||
|
|
||||||
auto now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
|
auto now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ bool hasSuffix(const std::string& path, const std::string& suffix) {
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||||
QCoreApplication::setOrganizationName("High Fidelity");
|
QCoreApplication::setOrganizationName("Vircadia");
|
||||||
QCoreApplication::setApplicationName("HQ Launcher");
|
QCoreApplication::setApplicationName("HQ Launcher");
|
||||||
|
|
||||||
Q_INIT_RESOURCE(resources);
|
Q_INIT_RESOURCE(resources);
|
||||||
|
|
|
@ -310,7 +310,7 @@ BOOL LauncherManager::getAndCreatePaths(PathType type, CString& outPath) {
|
||||||
outPath += DIRECTORY_NAME_INTERFACE;
|
outPath += DIRECTORY_NAME_INTERFACE;
|
||||||
} else if (type == PathType::Content_Directory) {
|
} else if (type == PathType::Content_Directory) {
|
||||||
outPath += DIRECTORY_NAME_CONTENT;
|
outPath += DIRECTORY_NAME_CONTENT;
|
||||||
}
|
}
|
||||||
return (CreateDirectory(outPath, NULL) || ERROR_ALREADY_EXISTS == GetLastError());
|
return (CreateDirectory(outPath, NULL) || ERROR_ALREADY_EXISTS == GetLastError());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -377,7 +377,7 @@ BOOL LauncherManager::createConfigJSON() {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
LauncherUtils::ResponseError LauncherManager::readConfigJSON(CString& version, CString& domain,
|
LauncherUtils::ResponseError LauncherManager::readConfigJSON(CString& version, CString& domain,
|
||||||
CString& content, bool& loggedIn, CString& organizationBuildTag) {
|
CString& content, bool& loggedIn, CString& organizationBuildTag) {
|
||||||
CString configPath;
|
CString configPath;
|
||||||
getAndCreatePaths(PathType::Interface_Directory, configPath);
|
getAndCreatePaths(PathType::Interface_Directory, configPath);
|
||||||
|
@ -388,7 +388,7 @@ LauncherUtils::ResponseError LauncherManager::readConfigJSON(CString& version, C
|
||||||
}
|
}
|
||||||
Json::Value config;
|
Json::Value config;
|
||||||
configFile >> config;
|
configFile >> config;
|
||||||
if (config["version"].isString() &&
|
if (config["version"].isString() &&
|
||||||
config["domain"].isString() &&
|
config["domain"].isString() &&
|
||||||
config["content"].isString()) {
|
config["content"].isString()) {
|
||||||
loggedIn = config["loggedIn"].asBool();
|
loggedIn = config["loggedIn"].asBool();
|
||||||
|
@ -446,7 +446,7 @@ LauncherUtils::ResponseError LauncherManager::readOrganizationJSON(const CString
|
||||||
CString url = _T("/organizations/") + hash + _T(".json");
|
CString url = _T("/organizations/") + hash + _T(".json");
|
||||||
LauncherUtils::ResponseError error = LauncherUtils::makeHTTPCall(getHttpUserAgent(),
|
LauncherUtils::ResponseError error = LauncherUtils::makeHTTPCall(getHttpUserAgent(),
|
||||||
true, L"orgs.highfidelity.com", url,
|
true, L"orgs.highfidelity.com", url,
|
||||||
contentTypeJson, CStringA(),
|
contentTypeJson, CStringA(),
|
||||||
response, false);
|
response, false);
|
||||||
if (error != LauncherUtils::ResponseError::NoError) {
|
if (error != LauncherUtils::ResponseError::NoError) {
|
||||||
return error;
|
return error;
|
||||||
|
@ -557,7 +557,7 @@ void LauncherManager::onMostRecentBuildsReceived(const CString& response, Launch
|
||||||
addToLog(_T("Already running most recent build. Launching interface.exe"));
|
addToLog(_T("Already running most recent build. Launching interface.exe"));
|
||||||
} else {
|
} else {
|
||||||
addToLog(_T("Updating the launcher was not allowed --noUpdate"));
|
addToLog(_T("Updating the launcher was not allowed --noUpdate"));
|
||||||
}
|
}
|
||||||
if (isInstalled) {
|
if (isInstalled) {
|
||||||
addToLog(_T("Installed version: ") + currentVersion);
|
addToLog(_T("Installed version: ") + currentVersion);
|
||||||
if (!newInterfaceVersion) {
|
if (!newInterfaceVersion) {
|
||||||
|
@ -576,7 +576,7 @@ void LauncherManager::onMostRecentBuildsReceived(const CString& response, Launch
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_shouldWait = FALSE;
|
_shouldWait = FALSE;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
setFailed(true);
|
setFailed(true);
|
||||||
CString msg;
|
CString msg;
|
||||||
|
@ -587,7 +587,7 @@ void LauncherManager::onMostRecentBuildsReceived(const CString& response, Launch
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LauncherUtils::ResponseError LauncherManager::getAccessTokenForCredentials(const CString& username,
|
LauncherUtils::ResponseError LauncherManager::getAccessTokenForCredentials(const CString& username,
|
||||||
const CString& password) {
|
const CString& password) {
|
||||||
CStringA post = "grant_type=password&username=";
|
CStringA post = "grant_type=password&username=";
|
||||||
post += username;
|
post += username;
|
||||||
|
@ -599,9 +599,9 @@ LauncherUtils::ResponseError LauncherManager::getAccessTokenForCredentials(const
|
||||||
CString response;
|
CString response;
|
||||||
LauncherUtils::ResponseError error = LauncherUtils::makeHTTPCall(getHttpUserAgent(),
|
LauncherUtils::ResponseError error = LauncherUtils::makeHTTPCall(getHttpUserAgent(),
|
||||||
true,
|
true,
|
||||||
L"metaverse.highfidelity.com",
|
L"metaverse.highfidelity.com",
|
||||||
L"/oauth/token",
|
L"/oauth/token",
|
||||||
contentTypeText, post,
|
contentTypeText, post,
|
||||||
response, true);
|
response, true);
|
||||||
if (error != LauncherUtils::ResponseError::NoError) {
|
if (error != LauncherUtils::ResponseError::NoError) {
|
||||||
return error;
|
return error;
|
||||||
|
@ -629,7 +629,7 @@ BOOL LauncherManager::createApplicationRegistryKeys(int size) {
|
||||||
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath);
|
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath);
|
||||||
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayVersion", LauncherUtils::cStringToStd(_latestVersion));
|
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayVersion", LauncherUtils::cStringToStd(_latestVersion));
|
||||||
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe);
|
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe);
|
||||||
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "Publisher", "High Fidelity");
|
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "Publisher", "Vircadia");
|
||||||
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "InstallDate", LauncherUtils::cStringToStd(CTime::GetCurrentTime().Format("%Y%m%d")));
|
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "InstallDate", LauncherUtils::cStringToStd(CTime::GetCurrentTime().Format("%Y%m%d")));
|
||||||
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "EstimatedSize", (DWORD)size);
|
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "EstimatedSize", (DWORD)size);
|
||||||
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "NoModify", (DWORD)1);
|
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "NoModify", (DWORD)1);
|
||||||
|
@ -686,9 +686,9 @@ BOOL LauncherManager::extractApplication() {
|
||||||
updateProgress(ProcessType::UnzipApplication, max(progress, 0.0f));
|
updateProgress(ProcessType::UnzipApplication, max(progress, 0.0f));
|
||||||
};
|
};
|
||||||
_currentProcess = ProcessType::UnzipApplication;
|
_currentProcess = ProcessType::UnzipApplication;
|
||||||
BOOL success = LauncherUtils::unzipFileOnThread(ProcessType::UnzipApplication,
|
BOOL success = LauncherUtils::unzipFileOnThread(ProcessType::UnzipApplication,
|
||||||
LauncherUtils::cStringToStd(_applicationZipPath),
|
LauncherUtils::cStringToStd(_applicationZipPath),
|
||||||
LauncherUtils::cStringToStd(installPath),
|
LauncherUtils::cStringToStd(installPath),
|
||||||
onExtractFinished, onProgress);
|
onExtractFinished, onProgress);
|
||||||
if (success) {
|
if (success) {
|
||||||
addToLog(_T("Created thread for unzipping application."));
|
addToLog(_T("Created thread for unzipping application."));
|
||||||
|
@ -737,7 +737,7 @@ void LauncherManager::restartNewLauncher() {
|
||||||
continueAction = ContinueActionOnStart::ContinueUpdate;
|
continueAction = ContinueActionOnStart::ContinueUpdate;
|
||||||
} else if (_keepLoggingIn) {
|
} else if (_keepLoggingIn) {
|
||||||
continueAction = ContinueActionOnStart::ContinueLogIn;
|
continueAction = ContinueActionOnStart::ContinueLogIn;
|
||||||
}
|
}
|
||||||
CStringW params;
|
CStringW params;
|
||||||
params.Format(_T(" --restart --noUpdate --continueAction %s"), getContinueActionParam(continueAction));
|
params.Format(_T(" --restart --noUpdate --continueAction %s"), getContinueActionParam(continueAction));
|
||||||
LauncherUtils::launchApplication(_tempLauncherPath, params.GetBuffer());
|
LauncherUtils::launchApplication(_tempLauncherPath, params.GetBuffer());
|
||||||
|
|
|
@ -26,8 +26,8 @@ if (osType == "Darwin") {
|
||||||
options["app-bundle-id"] = "com.highfidelity.hifi-screenshare";
|
options["app-bundle-id"] = "com.highfidelity.hifi-screenshare";
|
||||||
} else if (osType == "Windows_NT") {
|
} else if (osType == "Windows_NT") {
|
||||||
options["version-string"] = {
|
options["version-string"] = {
|
||||||
CompanyName: "High Fidelity, Inc.",
|
CompanyName: "Vircadia",
|
||||||
FileDescription: "High Fidelity Screenshare",
|
FileDescription: "Vircadia Screenshare",
|
||||||
ProductName: NAME,
|
ProductName: NAME,
|
||||||
OriginalFilename: NAME + ".exe"
|
OriginalFilename: NAME + ".exe"
|
||||||
}
|
}
|
||||||
|
@ -47,4 +47,3 @@ packager(options)
|
||||||
console.error("There was an error writing the packaged console: " + error.message);
|
console.error("There was an error writing the packaged console: " + error.message);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
});
|
});
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
//
|
//
|
||||||
// Created by Nissim Hadar on 1 Sept 2018.
|
// Created by Nissim Hadar on 1 Sept 2018.
|
||||||
// Copyright 2013 High Fidelity, Inc.
|
// Copyright 2013 High Fidelity, Inc.
|
||||||
|
// Copyright 2020 Vircadia contributors.
|
||||||
//
|
//
|
||||||
// Distributed under the Apache License, Version 2.0.
|
// Distributed under the Apache License, Version 2.0.
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
|
@ -46,7 +47,7 @@ TestRunnerDesktop::TestRunnerDesktop(
|
||||||
|
|
||||||
_installerThread = new QThread();
|
_installerThread = new QThread();
|
||||||
_installerWorker = new InstallerWorker();
|
_installerWorker = new InstallerWorker();
|
||||||
|
|
||||||
_installerWorker->moveToThread(_installerThread);
|
_installerWorker->moveToThread(_installerThread);
|
||||||
_installerThread->start();
|
_installerThread->start();
|
||||||
connect(this, SIGNAL(startInstaller()), _installerWorker, SLOT(runCommand()));
|
connect(this, SIGNAL(startInstaller()), _installerWorker, SLOT(runCommand()));
|
||||||
|
@ -77,9 +78,9 @@ void TestRunnerDesktop::setWorkingFolderAndEnableControls() {
|
||||||
setWorkingFolder(_workingFolderLabel);
|
setWorkingFolder(_workingFolderLabel);
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
_installationFolder = _workingFolder + "/High Fidelity";
|
_installationFolder = _workingFolder + "/Vircadia";
|
||||||
#elif defined Q_OS_MAC
|
#elif defined Q_OS_MAC
|
||||||
_installationFolder = _workingFolder + "/High_Fidelity";
|
_installationFolder = _workingFolder + "/Vircadia";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
nitpick->enableRunTabControls();
|
nitpick->enableRunTabControls();
|
||||||
|
@ -87,11 +88,11 @@ void TestRunnerDesktop::setWorkingFolderAndEnableControls() {
|
||||||
_timer = new QTimer(this);
|
_timer = new QTimer(this);
|
||||||
connect(_timer, SIGNAL(timeout()), this, SLOT(checkTime()));
|
connect(_timer, SIGNAL(timeout()), this, SLOT(checkTime()));
|
||||||
_timer->start(30 * 1000); //time specified in ms
|
_timer->start(30 * 1000); //time specified in ms
|
||||||
|
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
// Create MAC shell scripts
|
// Create MAC shell scripts
|
||||||
QFile script;
|
QFile script;
|
||||||
|
|
||||||
// This script waits for a process to start
|
// This script waits for a process to start
|
||||||
script.setFileName(_workingFolder + "/waitForStart.sh");
|
script.setFileName(_workingFolder + "/waitForStart.sh");
|
||||||
if (!script.open(QIODevice::WriteOnly | QIODevice::Text)) {
|
if (!script.open(QIODevice::WriteOnly | QIODevice::Text)) {
|
||||||
|
@ -99,7 +100,7 @@ void TestRunnerDesktop::setWorkingFolderAndEnableControls() {
|
||||||
"Could not open 'waitForStart.sh'");
|
"Could not open 'waitForStart.sh'");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
script.write("#!/bin/sh\n\n");
|
script.write("#!/bin/sh\n\n");
|
||||||
script.write("PROCESS=\"$1\"\n");
|
script.write("PROCESS=\"$1\"\n");
|
||||||
script.write("until (pgrep -x $PROCESS >nul)\n");
|
script.write("until (pgrep -x $PROCESS >nul)\n");
|
||||||
|
@ -118,7 +119,7 @@ void TestRunnerDesktop::setWorkingFolderAndEnableControls() {
|
||||||
"Could not open 'waitForFinish.sh'");
|
"Could not open 'waitForFinish.sh'");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
script.write("#!/bin/sh\n\n");
|
script.write("#!/bin/sh\n\n");
|
||||||
script.write("PROCESS=\"$1\"\n");
|
script.write("PROCESS=\"$1\"\n");
|
||||||
script.write("while (pgrep -x $PROCESS >nul)\n");
|
script.write("while (pgrep -x $PROCESS >nul)\n");
|
||||||
|
@ -129,7 +130,7 @@ void TestRunnerDesktop::setWorkingFolderAndEnableControls() {
|
||||||
script.write("echo \"$1\" \"finished\"\n");
|
script.write("echo \"$1\" \"finished\"\n");
|
||||||
script.close();
|
script.close();
|
||||||
script.setPermissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner);
|
script.setPermissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner);
|
||||||
|
|
||||||
// Create an AppleScript to resize Interface. This is needed so that snapshots taken
|
// Create an AppleScript to resize Interface. This is needed so that snapshots taken
|
||||||
// with the primary camera will be the correct size.
|
// with the primary camera will be the correct size.
|
||||||
// This will be run from a normal shell script
|
// This will be run from a normal shell script
|
||||||
|
@ -139,7 +140,7 @@ void TestRunnerDesktop::setWorkingFolderAndEnableControls() {
|
||||||
"Could not open 'setInterfaceSizeAndPosition.scpt'");
|
"Could not open 'setInterfaceSizeAndPosition.scpt'");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
script.write("set width to 960\n");
|
script.write("set width to 960\n");
|
||||||
script.write("set height to 540\n");
|
script.write("set height to 540\n");
|
||||||
script.write("set x to 100\n");
|
script.write("set x to 100\n");
|
||||||
|
@ -155,7 +156,7 @@ void TestRunnerDesktop::setWorkingFolderAndEnableControls() {
|
||||||
"Could not open 'setInterfaceSizeAndPosition.sh'");
|
"Could not open 'setInterfaceSizeAndPosition.sh'");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
script.write("#!/bin/sh\n\n");
|
script.write("#!/bin/sh\n\n");
|
||||||
script.write("echo resizing interface\n");
|
script.write("echo resizing interface\n");
|
||||||
script.write(("osascript " + _workingFolder + "/setInterfaceSizeAndPosition.scpt\n").toStdString().c_str());
|
script.write(("osascript " + _workingFolder + "/setInterfaceSizeAndPosition.scpt\n").toStdString().c_str());
|
||||||
|
@ -193,7 +194,7 @@ void TestRunnerDesktop::downloadComplete() {
|
||||||
// Download of Build XML has completed
|
// Download of Build XML has completed
|
||||||
buildXMLDownloaded = true;
|
buildXMLDownloaded = true;
|
||||||
|
|
||||||
// Download the High Fidelity installer
|
// Download the Vircadia installer
|
||||||
QStringList urls;
|
QStringList urls;
|
||||||
QStringList filenames;
|
QStringList filenames;
|
||||||
if (_runLatest->isChecked()) {
|
if (_runLatest->isChecked()) {
|
||||||
|
@ -251,23 +252,23 @@ void TestRunnerDesktop::runInstaller() {
|
||||||
"Could not open 'install_app.sh'");
|
"Could not open 'install_app.sh'");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!QDir().exists(_installationFolder)) {
|
if (!QDir().exists(_installationFolder)) {
|
||||||
QDir().mkdir(_installationFolder);
|
QDir().mkdir(_installationFolder);
|
||||||
}
|
}
|
||||||
|
|
||||||
// This script installs High Fidelity. It is run as "yes | install_app.sh... so "yes" is killed at the end
|
// This script installs Vircadia. It is run as "yes | install_app.sh... so "yes" is killed at the end
|
||||||
script.write("#!/bin/sh\n\n");
|
script.write("#!/bin/sh\n\n");
|
||||||
script.write("VOLUME=`hdiutil attach \"$1\" | grep Volumes | awk '{print $3}'`\n");
|
script.write("VOLUME=`hdiutil attach \"$1\" | grep Volumes | awk '{print $3}'`\n");
|
||||||
|
|
||||||
QString folderName {"High Fidelity"};
|
QString folderName {"Vircadia"};
|
||||||
if (!_runLatest->isChecked()) {
|
if (!_runLatest->isChecked()) {
|
||||||
folderName += QString(" - ") + getPRNumberFromURL(_url->text());
|
folderName += QString(" - ") + getPRNumberFromURL(_url->text());
|
||||||
}
|
}
|
||||||
|
|
||||||
script.write((QString("cp -Rf \"$VOLUME/") + folderName + "/interface.app\" \"" + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
|
script.write((QString("cp -Rf \"$VOLUME/") + folderName + "/interface.app\" \"" + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
|
||||||
script.write((QString("cp -Rf \"$VOLUME/") + folderName + "/Sandbox.app\" \"" + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
|
script.write((QString("cp -Rf \"$VOLUME/") + folderName + "/Sandbox.app\" \"" + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
|
||||||
|
|
||||||
script.write("hdiutil detach \"$VOLUME\"\n");
|
script.write("hdiutil detach \"$VOLUME\"\n");
|
||||||
script.write("killall yes\n");
|
script.write("killall yes\n");
|
||||||
script.close();
|
script.close();
|
||||||
|
@ -303,10 +304,10 @@ void TestRunnerDesktop::verifyInstallationSucceeded() {
|
||||||
if (!interfaceExe.exists() || !assignmentClientExe.exists() || !domainServerExe.exists()) {
|
if (!interfaceExe.exists() || !assignmentClientExe.exists() || !domainServerExe.exists()) {
|
||||||
if (_runLatest->isChecked()) {
|
if (_runLatest->isChecked()) {
|
||||||
// On Windows, the reason is probably that UAC has blocked the installation. This is treated as a critical error
|
// On Windows, the reason is probably that UAC has blocked the installation. This is treated as a critical error
|
||||||
QMessageBox::critical(0, "Installation of High Fidelity has failed", "Please verify that UAC has been disabled");
|
QMessageBox::critical(0, "Installation of Vircadia has failed", "Please verify that UAC has been disabled");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
} else {
|
} else {
|
||||||
QMessageBox::critical(0, "Installation of High Fidelity not found", "Please verify that working folder contains a proper installation");
|
QMessageBox::critical(0, "Installation of vircadia not found", "Please verify that working folder contains a proper installation");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -320,10 +321,10 @@ void TestRunnerDesktop::saveExistingHighFidelityAppDataFolder() {
|
||||||
dataDirectory = QDir::homePath() + "/Library/Application Support";
|
dataDirectory = QDir::homePath() + "/Library/Application Support";
|
||||||
#endif
|
#endif
|
||||||
if (_runLatest->isChecked()) {
|
if (_runLatest->isChecked()) {
|
||||||
_appDataFolder = dataDirectory + "/High Fidelity";
|
_appDataFolder = dataDirectory + "/Vircadia";
|
||||||
} else {
|
} else {
|
||||||
// We are running a PR build
|
// We are running a PR build
|
||||||
_appDataFolder = dataDirectory + "/High Fidelity - " + getPRNumberFromURL(_url->text());
|
_appDataFolder = dataDirectory + "/Vircadia - " + getPRNumberFromURL(_url->text());
|
||||||
}
|
}
|
||||||
|
|
||||||
_savedAppDataFolder = dataDirectory + "/" + UNIQUE_FOLDER_NAME;
|
_savedAppDataFolder = dataDirectory + "/" + UNIQUE_FOLDER_NAME;
|
||||||
|
@ -419,13 +420,13 @@ void TestRunnerDesktop::killProcesses() {
|
||||||
}
|
}
|
||||||
#elif defined Q_OS_MAC
|
#elif defined Q_OS_MAC
|
||||||
QString commandLine;
|
QString commandLine;
|
||||||
|
|
||||||
commandLine = QString("killall interface") + "; " + _workingFolder +"/waitForFinish.sh interface";
|
commandLine = QString("killall interface") + "; " + _workingFolder +"/waitForFinish.sh interface";
|
||||||
system(commandLine.toStdString().c_str());
|
system(commandLine.toStdString().c_str());
|
||||||
|
|
||||||
commandLine = QString("killall Sandbox") + "; " + _workingFolder +"/waitForFinish.sh Sandbox";
|
commandLine = QString("killall Sandbox") + "; " + _workingFolder +"/waitForFinish.sh Sandbox";
|
||||||
system(commandLine.toStdString().c_str());
|
system(commandLine.toStdString().c_str());
|
||||||
|
|
||||||
commandLine = QString("killall Console") + "; " + _workingFolder +"/waitForFinish.sh Console";
|
commandLine = QString("killall Console") + "; " + _workingFolder +"/waitForFinish.sh Console";
|
||||||
system(commandLine.toStdString().c_str());
|
system(commandLine.toStdString().c_str());
|
||||||
#endif
|
#endif
|
||||||
|
@ -433,7 +434,7 @@ void TestRunnerDesktop::killProcesses() {
|
||||||
|
|
||||||
void TestRunnerDesktop::startLocalServerProcesses() {
|
void TestRunnerDesktop::startLocalServerProcesses() {
|
||||||
QString commandLine;
|
QString commandLine;
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
commandLine =
|
commandLine =
|
||||||
"start \"domain-server.exe\" \"" + QDir::toNativeSeparators(_installationFolder) + "\\domain-server.exe\"";
|
"start \"domain-server.exe\" \"" + QDir::toNativeSeparators(_installationFolder) + "\\domain-server.exe\"";
|
||||||
|
@ -501,9 +502,9 @@ void TestRunnerDesktop::runInterfaceWithTestScript() {
|
||||||
"Could not open 'runInterfaceTests.sh'");
|
"Could not open 'runInterfaceTests.sh'");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
script.write("#!/bin/sh\n\n");
|
script.write("#!/bin/sh\n\n");
|
||||||
|
|
||||||
// First, run script to delete any entities in test area
|
// First, run script to delete any entities in test area
|
||||||
commandLine =
|
commandLine =
|
||||||
"open -W \"" +_installationFolder + "/interface.app\" --args" +
|
"open -W \"" +_installationFolder + "/interface.app\" --args" +
|
||||||
|
@ -511,9 +512,9 @@ void TestRunnerDesktop::runInterfaceWithTestScript() {
|
||||||
" --no-updater" +
|
" --no-updater" +
|
||||||
" --no-login-suggestion"
|
" --no-login-suggestion"
|
||||||
" --testScript " + deleteScript + " quitWhenFinished\n";
|
" --testScript " + deleteScript + " quitWhenFinished\n";
|
||||||
|
|
||||||
script.write(commandLine.toStdString().c_str());
|
script.write(commandLine.toStdString().c_str());
|
||||||
|
|
||||||
// On The Mac, we need to resize Interface. The Interface window opens a few seconds after the process
|
// On The Mac, we need to resize Interface. The Interface window opens a few seconds after the process
|
||||||
// has started.
|
// has started.
|
||||||
// Before starting interface, start a process that will resize interface 10s after it opens
|
// Before starting interface, start a process that will resize interface 10s after it opens
|
||||||
|
@ -539,7 +540,7 @@ void TestRunnerDesktop::runInterfaceWithTestScript() {
|
||||||
|
|
||||||
emit startInterface();
|
emit startInterface();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Helpful for debugging
|
// Helpful for debugging
|
||||||
appendLog(commandLine);
|
appendLog(commandLine);
|
||||||
}
|
}
|
||||||
|
@ -555,7 +556,7 @@ void TestRunnerDesktop::interfaceExecutionComplete() {
|
||||||
|
|
||||||
evaluateResults();
|
evaluateResults();
|
||||||
|
|
||||||
// The High Fidelity AppData folder will be restored after evaluation has completed
|
// The Vircadia AppData folder will be restored after evaluation has completed
|
||||||
}
|
}
|
||||||
|
|
||||||
void TestRunnerDesktop::evaluateResults() {
|
void TestRunnerDesktop::evaluateResults() {
|
||||||
|
|
Loading…
Reference in a new issue