From 9593b0e76491855b3a6e2aeb9d2974555aa26398 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Thu, 17 Jan 2019 08:23:49 -0800 Subject: [PATCH 1/4] Removed debug code. --- cmake/macros/FixupNitpick.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmake/macros/FixupNitpick.cmake b/cmake/macros/FixupNitpick.cmake index aa1176d5f1..e72d9156b6 100644 --- a/cmake/macros/FixupNitpick.cmake +++ b/cmake/macros/FixupNitpick.cmake @@ -11,8 +11,6 @@ macro(fixup_nitpick) if (APPLE) -message(STATUS ${QT_DIR}) -message(STATUS "____________________") string(REPLACE " " "\\ " ESCAPED_BUNDLE_NAME ${NITPICK_BUNDLE_NAME}) string(REPLACE " " "\\ " ESCAPED_INSTALL_PATH ${NITPICK_INSTALL_DIR}) set(_NITPICK_INSTALL_PATH "${ESCAPED_INSTALL_PATH}/${ESCAPED_BUNDLE_NAME}.app") From 88078d168f6dbd5ae30b1da9da5f84627e945c3e Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Thu, 17 Jan 2019 08:26:18 -0800 Subject: [PATCH 2/4] DEBUG --- tools/nitpick/src/TestRunner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nitpick/src/TestRunner.cpp b/tools/nitpick/src/TestRunner.cpp index d6d60e773d..b56b3e0ff3 100644 --- a/tools/nitpick/src/TestRunner.cpp +++ b/tools/nitpick/src/TestRunner.cpp @@ -359,7 +359,7 @@ void TestRunner::saveExistingHighFidelityAppDataFolder() { #ifdef Q_OS_WIN canonicalAppDataFolder = QDir::currentPath() + "/AppDataHighFidelity"; #elif defined Q_OS_MAC - canonicalAppDataFolder = QCoreApplication::applicationDirPath() + "/AppDataHighFidelity"; + ////canonicalAppDataFolder = QCoreApplication::applicationDirPath() + "/AppDataHighFidelity"; #endif if (canonicalAppDataFolder.exists()) { copyFolder(canonicalAppDataFolder.path(), _appDataFolder.path()); From 77f381b558e940f47221560064a1a93e90ef6198 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Thu, 17 Jan 2019 09:29:47 -0800 Subject: [PATCH 3/4] DEBUG --- tools/nitpick/CMakeLists.txt | 6 ------ tools/nitpick/src/TestRunner.cpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/nitpick/CMakeLists.txt b/tools/nitpick/CMakeLists.txt index ffacfc00c7..6b7f9c8dba 100644 --- a/tools/nitpick/CMakeLists.txt +++ b/tools/nitpick/CMakeLists.txt @@ -176,12 +176,6 @@ if (APPLE) # call the fixup_nitpick macro to add required bundling commands for installation fixup_nitpick() - # add a custom command to copy the empty AppData 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" "$/AppDataHighFidelity" - ) else() set(NITPICK_EXEC_DIR "$") set(RESOURCES_DEV_DIR "${NITPICK_EXEC_DIR}/resources") diff --git a/tools/nitpick/src/TestRunner.cpp b/tools/nitpick/src/TestRunner.cpp index b56b3e0ff3..d6d60e773d 100644 --- a/tools/nitpick/src/TestRunner.cpp +++ b/tools/nitpick/src/TestRunner.cpp @@ -359,7 +359,7 @@ void TestRunner::saveExistingHighFidelityAppDataFolder() { #ifdef Q_OS_WIN canonicalAppDataFolder = QDir::currentPath() + "/AppDataHighFidelity"; #elif defined Q_OS_MAC - ////canonicalAppDataFolder = QCoreApplication::applicationDirPath() + "/AppDataHighFidelity"; + canonicalAppDataFolder = QCoreApplication::applicationDirPath() + "/AppDataHighFidelity"; #endif if (canonicalAppDataFolder.exists()) { copyFolder(canonicalAppDataFolder.path(), _appDataFolder.path()); From 5e5374ebddc9b23de17c55d45722954912404e46 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Thu, 17 Jan 2019 09:47:53 -0800 Subject: [PATCH 4/4] DEBUG --- tools/nitpick/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/nitpick/CMakeLists.txt b/tools/nitpick/CMakeLists.txt index 6b7f9c8dba..ffacfc00c7 100644 --- a/tools/nitpick/CMakeLists.txt +++ b/tools/nitpick/CMakeLists.txt @@ -176,6 +176,12 @@ if (APPLE) # call the fixup_nitpick macro to add required bundling commands for installation fixup_nitpick() + # add a custom command to copy the empty AppData 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" "$/AppDataHighFidelity" + ) else() set(NITPICK_EXEC_DIR "$") set(RESOURCES_DEV_DIR "${NITPICK_EXEC_DIR}/resources")