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

Added AppData folder copy.

Browse source
This commit is contained in:
NissimHadar 2019-01-16 14:46:52 -08:00
parent b0fc794426
commit 7d5bb6eaf8
4 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/nitpick/CMakeLists.txt
View file

@ -185,6 +185,12 @@ if (APPLE)
# call the fixup_nitpick macro to add required bundling commands for installation # call the fixup_nitpick macro to add required bundling commands for installation
fixup_nitpick() fixup_nitpick()
# add a custom command to copy the empty Apps/Data High Fidelity folder (i.e. - a valid folder with no entities)
add_custom_command(
TARGET ${TARGET_NAME}
POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity"
)
else() else()
set(NITPICK_EXEC_DIR "$<TARGET_FILE_DIR:${TARGET_NAME}>") set(NITPICK_EXEC_DIR "$<TARGET_FILE_DIR:${TARGET_NAME}>")
set(RESOURCES_DEV_DIR "${NITPICK_EXEC_DIR}/resources") set(RESOURCES_DEV_DIR "${NITPICK_EXEC_DIR}/resources")
@ -218,6 +224,14 @@ else()
set(EXECUTABLE_COMPONENT ${CLIENT_COMPONENT}) set(EXECUTABLE_COMPONENT ${CLIENT_COMPONENT})
optional_win_executable_signing() optional_win_executable_signing()
# add a custom command to copy the empty Apps/Data High Fidelity folder (i.e. - a valid folder with no entities)
add_custom_command(
TARGET ${TARGET_NAME}
POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity"
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "AppDataHighFidelity"
)
endif() endif()
endif() endif()

BIN
tools/nitpick/compiledResources/resources.rcc
View file

Binary file not shown.

2
tools/nitpick/src/Nitpick.cpp
View file

@ -38,7 +38,7 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
_ui.statusLabel->setText(""); _ui.statusLabel->setText("");
_ui.plainTextEdit->setReadOnly(true); _ui.plainTextEdit->setReadOnly(true);
setWindowTitle("Nitpick - v1.3.2"); setWindowTitle("Nitpick - v1.3.3");
} }
Nitpick::~Nitpick() { Nitpick::~Nitpick() {

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

@ -355,7 +355,13 @@ void TestRunner::saveExistingHighFidelityAppDataFolder() {
} }
// Copy an "empty" AppData folder (i.e. no entities) // Copy an "empty" AppData folder (i.e. no entities)
copyFolder(QDir::currentPath() + "/AppDataHighFidelity", _appDataFolder.path()); QDir canonicalAppDataFolder{ QDir::currentPath() + "/AppDataHighFidelity" };
if (canonicalAppDataFolder.exists()) {
copyFolder(canonicalAppDataFolder.path(), _appDataFolder.path());
} else {
QMessageBox::critical(0, "Internal error", "The nitpick AppData folder cannot be found at:\n" + canonicalAppDataFolder.path());
exit(-1);
}
} }
void TestRunner::createSnapshotFolder() { void TestRunner::createSnapshotFolder() {