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

Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData

Browse source
This commit is contained in:
NissimHadar 2018-11-26 08:25:54 -08:00
commit f4f1ac8f02
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/nitpick/README.md
View file

@ -34,8 +34,9 @@ These steps assume the hifi repository has been cloned to `~/hifi`.
`cp ~/hifi/build/ext/Xcode/quazip/project/lib/libquazip5.1.dylib .` `cp ~/hifi/build/ext/Xcode/quazip/project/lib/libquazip5.1.dylib .`
1. Change the loader instruction to find the dynamic library locally 1. Change the loader instruction to find the dynamic library locally
`install_name_tool -change ~/hifi/build/ext/Xcode/quazip/project/lib/libquazip5.1.dylib libquazip5.1.dylib nitpick` `install_name_tool -change ~/hifi/build/ext/Xcode/quazip/project/lib/libquazip5.1.dylib libquazip5.1.dylib nitpick`
1. Delete any existing installer: `rm nitpick.dmg` 1. Delete any existing disk images: `rm *.dmg`
1. Create installer (note final period): `create-dmg --volname nitpick-installer-v1.1 nitpick-installer-v1.1.dmg .` 1. Create installer (note final period): `create-dmg --volname nitpick-installer-v1.1 nitpick-installer-v1.1.dmg .`
Make sure to wait for completion.
1. Copy created installer to AWS: `~/Library/Python/3.7/bin/aws s3 cp nitpick-installer-v1.1.dmg s3://hifi-qa/nitpick/Mac/nitpick-installer-v1.1.dmg` 1. Copy created installer to AWS: `~/Library/Python/3.7/bin/aws s3 cp nitpick-installer-v1.1.dmg s3://hifi-qa/nitpick/Mac/nitpick-installer-v1.1.dmg`
### Installation ### Installation
#### Windows #### Windows

4
tools/nitpick/src/Downloader.cpp
View file

@ -12,12 +12,12 @@
#include <QtWidgets/QMessageBox> #include <QtWidgets/QMessageBox>
Downloader::Downloader(QUrl fileURL, QObject *parent) : QObject(parent) { Downloader::Downloader(QUrl fileURL, QObject *parent) : QObject(parent) {
_networkAccessManager.get(QNetworkRequest(fileURL));
connect( connect(
&_networkAccessManager, SIGNAL (finished(QNetworkReply*)), &_networkAccessManager, SIGNAL (finished(QNetworkReply*)),
this, SLOT (fileDownloaded(QNetworkReply*)) this, SLOT (fileDownloaded(QNetworkReply*))
); );
_networkAccessManager.get(QNetworkRequest(fileURL));
} }
void Downloader::fileDownloaded(QNetworkReply* reply) { void Downloader::fileDownloaded(QNetworkReply* reply) {

4
tools/nitpick/src/TestRunner.cpp
View file

@ -582,15 +582,11 @@ void TestRunner::addBuildNumberToResults(QString zippedFolderName) {
} }
void TestRunner::restoreHighFidelityAppDataFolder() { void TestRunner::restoreHighFidelityAppDataFolder() {
#ifdef Q_OS_WIN
_appDataFolder.removeRecursively(); _appDataFolder.removeRecursively();
if (_savedAppDataFolder != QDir()) { if (_savedAppDataFolder != QDir()) {
_appDataFolder.rename(_savedAppDataFolder.path(), _appDataFolder.path()); _appDataFolder.rename(_savedAppDataFolder.path(), _appDataFolder.path());
} }
#elif defined Q_OS_MAC
// TODO: find Mac equivalent of AppData
#endif
} }
// Copies a folder recursively // Copies a folder recursively