From 6bdedeb5cec21b600a88eac5d32abe3cf2fc9373 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 11:59:49 -0700 Subject: [PATCH 01/21] change packaging parameters for Sandbox/Interface --- cmake/macros/GenerateInstallers.cmake | 4 ++-- cmake/macros/SetPackagingParameters.cmake | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake index b4744aa172..8d1eca84d7 100644 --- a/cmake/macros/GenerateInstallers.cmake +++ b/cmake/macros/GenerateInstallers.cmake @@ -85,8 +85,8 @@ macro(GENERATE_INSTALLERS) set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") - cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Client") - cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Server") + cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Interface") + cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Sandbox") include(CPack) endmacro() diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 92e3273f67..1886ca36ac 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -53,7 +53,7 @@ macro(SET_PACKAGING_PARAMETERS) set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME}) set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME}) - set(CONSOLE_EXEC_NAME "Server Console.app") + set(CONSOLE_EXEC_NAME "Sandbox.app") set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}") set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents") @@ -64,7 +64,7 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns") else () if (WIN32) - set(CONSOLE_INSTALL_DIR "server-console") + set(CONSOLE_INSTALL_DIR "sandbox") else () set(CONSOLE_INSTALL_DIR ".") endif () @@ -77,18 +77,18 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_EXEC_PREFIX "interface") set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico") - set(CONSOLE_EXEC_NAME "server-console.exe") + set(CONSOLE_EXEC_NAME "sandbox.exe") set(DS_EXEC_NAME "domain-server.exe") set(AC_EXEC_NAME "assignment-client.exe") # shortcut names if (PRODUCTION_BUILD) - set(INTERFACE_SHORTCUT_NAME "High Fidelity") - set(CONSOLE_SHORTCUT_NAME "Server Console") + set(INTERFACE_SHORTCUT_NAME "Interface") + set(CONSOLE_SHORTCUT_NAME "Sandbox") else () - set(INTERFACE_SHORTCUT_NAME "High Fidelity - ${BUILD_VERSION}") - set(CONSOLE_SHORTCUT_NAME "Server Console - ${BUILD_VERSION}") + set(INTERFACE_SHORTCUT_NAME "Interface - ${BUILD_VERSION}") + set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}") endif () # check if we need to find signtool if (PRODUCTION_BUILD OR PR_BUILD) From 724c95fbd6bbd363f23ee6871bc314ea28e989a5 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:05:17 -0700 Subject: [PATCH 02/21] leave executable name for server-console --- cmake/macros/SetPackagingParameters.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 1886ca36ac..cdbddf84e5 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -77,7 +77,7 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_EXEC_PREFIX "interface") set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico") - set(CONSOLE_EXEC_NAME "sandbox.exe") + set(CONSOLE_EXEC_NAME "server-console.exe") set(DS_EXEC_NAME "domain-server.exe") set(AC_EXEC_NAME "assignment-client.exe") From 238f9e9298cc6bf7c9c7c2d532f1208752479c17 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:07:40 -0700 Subject: [PATCH 03/21] remove the Stack Manager migration section --- server-console/src/splash.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/server-console/src/splash.html b/server-console/src/splash.html index 30868ebb6f..b9947bcbaa 100644 --- a/server-console/src/splash.html +++ b/server-console/src/splash.html @@ -23,7 +23,7 @@ High Fidelity is now installed and your Home domain is ready for you to explore.

-You can make your home yours by uploading your own models and scripts, and adding items from the Market. +You can make your home yours by uploading your own models and scripts.

@@ -67,12 +67,6 @@ You can make your home yours by uploading your own models and scripts, and addin -
-

-

Your existing Stack Manager content is safe.

- Server Console comes with demo content but does not overwrite your data. See our guide to importing content previously managed with Stack Manager. -

-
From 2ea0309955ea070373fc9cb0589dca5316eeb9d6 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:08:56 -0700 Subject: [PATCH 04/21] change setup options and prompts to close running applications --- cmake/templates/NSIS.template.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index ca26be6ab0..c0f84a6b7f 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -414,7 +414,7 @@ Function PostInstallOptionsPage ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity Server Console after install" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ after install" ${Else} ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity after install" ${EndIf} @@ -465,10 +465,10 @@ Function ReadPostInstallOptions ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ; check if the user asked for a desktop shortcut to Server Console + ; check if the user asked for a desktop shortcut to Sandbox ${NSD_GetState} $DesktopServerCheckbox $DesktopServerState - ; check if the user asked to have Server Console launched every startup + ; check if the user asked to have Sandbox launched every startup ${NSD_GetState} $ServerStartupCheckbox $ServerStartupState ${EndIf} @@ -494,7 +494,7 @@ Function HandlePostInstallOptions ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ; check if the user asked for a desktop shortcut to Server Console + ; check if the user asked for a desktop shortcut to Sandbox ${If} $DesktopServerState == ${BST_CHECKED} CreateShortCut "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES @@ -502,7 +502,7 @@ Function HandlePostInstallOptions !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO ${EndIf} - ; check if the user asked to have Server Console launched every startup + ; check if the user asked to have Sandbox launched every startup ${If} $ServerStartupState == ${BST_CHECKED} ; in case we added a shortcut in the global context, pull that now SetShellVarContext all @@ -724,8 +724,8 @@ SectionEnd !macroend !macro CheckForRunningApplications action prompter - !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "High Fidelity client" ${action} ${prompter} - !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "Server Console" ${action} ${prompter} + !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "High Fidelity Interface" ${action} ${prompter} + !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "High Fidelity Sandbox" ${action} ${prompter} !insertmacro PromptForRunningApplication "@DS_EXEC_NAME@" "Domain Server" ${action} ${prompter} !insertmacro PromptForRunningApplication "@AC_EXEC_NAME@" "Assignment Client" ${action} ${prompter} !macroend From bbbfa7227fcc0c908f4d76ace87a1300e0b5393a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:41:13 -0700 Subject: [PATCH 05/21] changes to electron app for Sandbox rename --- server-console/.gitignore | 1 + server-console/packager.js | 6 +++--- server-console/src/main.js | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/server-console/.gitignore b/server-console/.gitignore index 1624823e80..b293c73eb5 100644 --- a/server-console/.gitignore +++ b/server-console/.gitignore @@ -1,5 +1,6 @@ Server\ Console-*/ server-console-*/ +Sandbox-*/ electron-packager/ npm-debug.log logs/ diff --git a/server-console/packager.js b/server-console/packager.js index bf8ddd68d4..1f90a300a3 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -23,12 +23,12 @@ var options = { arch: "x64", platform: platform, icon: "resources/" + iconName, - ignore: "logs|(S|s)erver(\\s|-)(C|c)onsole-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore" + ignore: "logs|(S|s)andbox-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore" } const EXEC_NAME = "server-console"; -const SHORT_NAME = "Server Console"; -const FULL_NAME = "High Fidelity Server Console"; +const SHORT_NAME = "Sandbox"; +const FULL_NAME = "High Fidelity Sandbox"; // setup per OS options if (osType == "Darwin") { diff --git a/server-console/src/main.js b/server-console/src/main.js index 18cffdb81b..b36d798a30 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -111,8 +111,8 @@ function shutdown() { dialog.showMessageBox({ type: 'question', buttons: ['Yes', 'No'], - title: 'Stopping Server Console', - message: 'Quitting will stop your Server Console and your Home domain will no longer be running.\nDo you wish to continue?' + title: 'Stopping High Fidelity Sandbox', + message: 'Quitting will stop your Sandbox and your Home domain will no longer be running.\nDo you wish to continue?' }, shutdownCallback); } else { shutdownCallback(0); @@ -212,7 +212,7 @@ var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) }); if (shouldQuit) { - console.warn("Another instance of the Server Console is already running - this instance will quit."); + console.warn("Another instance of the Sandbox is already running - this instance will quit."); app.quit(); return; } @@ -237,7 +237,7 @@ function binaryMissingMessage(displayName, executableName, required) { var message = "The " + displayName + " executable was not found.\n"; if (required) { - message += "It is required for the Server Console to run.\n\n"; + message += "It is required for the High Fidelity Sandbox to run.\n\n"; } else { message += "\n"; } @@ -250,7 +250,7 @@ function binaryMissingMessage(displayName, executableName, required) { message += paths.join("\n"); } else { message += "It is expected to be found beside this executable.\n"; - message += "You may need to re-install the Server Console."; + message += "You may need to re-install the High Fidelity Sandbox."; } return message; @@ -770,7 +770,7 @@ app.on('ready', function() { // Create tray icon tray = new Tray(trayIcons[ProcessGroupStates.STOPPED]); - tray.setToolTip('High Fidelity Server Console'); + tray.setToolTip('High Fidelity Sandbox'); tray.on('click', function() { tray.popUpContextMenu(tray.menu); From d80f612c6206e35ed8652a98e6da4de551124e12 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:44:10 -0700 Subject: [PATCH 06/21] continue to ignore old server console output directory --- server-console/packager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-console/packager.js b/server-console/packager.js index 1f90a300a3..657098d2f4 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -23,7 +23,7 @@ var options = { arch: "x64", platform: platform, icon: "resources/" + iconName, - ignore: "logs|(S|s)andbox-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore" + ignore: "logs|(S|s)erver(\\s|-)(C|c)onsole-\\S+|(S|s)andbox-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore" } const EXEC_NAME = "server-console"; From 2d1c4243f5af3e77939c7db0d5a50f0083c40de1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:47:18 -0700 Subject: [PATCH 07/21] prepend desktop shortcuts with High Fidelity --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index c0f84a6b7f..ba2ffc36a9 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -485,7 +485,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to High Fidelity ${If} $DesktopClientState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\High Fidelity @INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES ${Else} !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO @@ -496,7 +496,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to Sandbox ${If} $DesktopServerState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\High Fidelity @CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES ${Else} !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO From 4940639e11ceaf006f5aa4af3769db2bca162946 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:48:11 -0700 Subject: [PATCH 08/21] clear old desktop shortcuts from before rename --- cmake/templates/NSIS.template.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index ba2ffc36a9..8c41b434f4 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -589,6 +589,10 @@ Section "-Core installation" Delete "$INSTDIR\version" Delete "$INSTDIR\xinput1_3.dll" + ; Delete old desktop shortcuts before they were renamed + Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" + ; Rename the incorrectly cased Raleway font Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml" From 05163367e16471b7e98029843a1f19567930f3ae Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:49:55 -0700 Subject: [PATCH 09/21] delete old start menu items from before rename --- cmake/templates/NSIS.template.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 8c41b434f4..68ce78b560 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -593,6 +593,10 @@ Section "-Core installation" Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" + ; Delete old startmenu shortcuts before rename + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\High Fidelity.lnk" + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Server Console.lnk" + ; Rename the incorrectly cased Raleway font Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml" From a200e56f924d14714f3841214ba52c9654c48888 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:52:11 -0700 Subject: [PATCH 10/21] remove old startup menu item for Server Console --- cmake/templates/NSIS.template.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 68ce78b560..f268feab37 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -589,14 +589,17 @@ Section "-Core installation" Delete "$INSTDIR\version" Delete "$INSTDIR\xinput1_3.dll" - ; Delete old desktop shortcuts before they were renamed + ; Delete old desktop shortcuts before they were renamed during Sandbox rename Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" - ; Delete old startmenu shortcuts before rename + ; Delete old Start Menu shortcuts before Sandbox rename Delete "$SMPROGRAMS\$STARTMENU_FOLDER\High Fidelity.lnk" Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Server Console.lnk" + ; Delete old startup item for Server Console before Sandbox rename + Delete "$SMSTARTUP\Server Console.lnk" + ; Rename the incorrectly cased Raleway font Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml" From 8e9b337701957c967ea070ccf517bb0530d5aec2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:56:09 -0700 Subject: [PATCH 11/21] replace the server console logo with a sandbox logo --- .../src/images/console-hf-logo-2x.png | Bin 12108 -> 12215 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/server-console/src/images/console-hf-logo-2x.png b/server-console/src/images/console-hf-logo-2x.png index 4c0afd67779133af27925d7c0db7cf98306606b0..420fb18fdeba2ccfb195f5a9955ace35db96f574 100644 GIT binary patch delta 11449 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 delta 11294 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 ar9i_1b4z4gZ{50e>#>%;CI$=*`Tqbn4+RMT From bd3d08db3bbc6914cba55db5db87b31b8321fbc3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:00:23 -0700 Subject: [PATCH 12/21] prepend Interface with High Fidelity in setup options --- cmake/templates/NSIS.template.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index f268feab37..f92e69c511 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -387,7 +387,7 @@ Function PostInstallOptionsPage StrCpy $OffsetUnits u ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_SHORTCUT_NAME@" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for High Fidelity @INTERFACE_SHORTCUT_NAME@" Pop $DesktopClientCheckbox IntOp $CurrentOffset $CurrentOffset + 15 From 02d93e2a1124cf61a25dd7d903ae2f1f3f209e4c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:09:36 -0700 Subject: [PATCH 13/21] cleanup fixes for old shortcuts in NSIS script --- cmake/macros/SetPackagingParameters.cmake | 7 ++++++ cmake/templates/CPackProperties.cmake.in | 4 ++++ cmake/templates/NSIS.template.in | 26 ++++++++++++----------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index cdbddf84e5..ef885df09e 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -90,6 +90,13 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_SHORTCUT_NAME "Interface - ${BUILD_VERSION}") set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}") endif () + + set(INTERFACE_HF_SHORTCUT_NAME "High Fidelity ${INTERFACE_SHORTCUT_NAME}") + set(CONSOLE_HF_SHORTCUT_NAME "High Fidelity ${CONSOLE_SHORTCUT_NAME}") + + set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "High Fidelity") + set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "Server Console") + # check if we need to find signtool if (PRODUCTION_BUILD OR PR_BUILD) find_program(SIGNTOOL_EXECUTABLE signtool PATHS "C:/Program Files (x86)/Windows Kits/8.1" PATH_SUFFIXES "bin/x64") diff --git a/cmake/templates/CPackProperties.cmake.in b/cmake/templates/CPackProperties.cmake.in index 164e432706..d22ba1f5e1 100644 --- a/cmake/templates/CPackProperties.cmake.in +++ b/cmake/templates/CPackProperties.cmake.in @@ -10,10 +10,14 @@ # set(INTERFACE_SHORTCUT_NAME "@INTERFACE_SHORTCUT_NAME@") +set(INTERFACE_HF_SHORTCUT_NAME "@INTERFACE_HF_SHORTCUT_NAME@") set(INTERFACE_WIN_EXEC_NAME "@INTERFACE_EXEC_PREFIX@.exe") set(CONSOLE_INSTALL_SUBDIR "@CONSOLE_INSTALL_DIR@") set(CONSOLE_SHORTCUT_NAME "@CONSOLE_SHORTCUT_NAME@") +set(CONSOLE_HF_SHORTCUT_NAME "@CONSOLE_HF_SHORTCUT_NAME@") set(CONSOLE_WIN_EXEC_NAME "@CONSOLE_EXEC_NAME@") +set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@") +set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@") set(DS_EXEC_NAME "@DS_EXEC_NAME@") set(AC_EXEC_NAME "@AC_EXEC_NAME@") set(HIGH_FIDELITY_PROTOCOL "@HIGH_FIDELITY_PROTOCOL@") diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index f92e69c511..8c494620e5 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -416,7 +416,7 @@ Function PostInstallOptionsPage ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ after install" ${Else} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity after install" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @INTERFACE_SHORTCUT_NAME@ after install" ${EndIf} Pop $LaunchNowCheckbox @@ -485,7 +485,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to High Fidelity ${If} $DesktopClientState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\High Fidelity @INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\@INTERFACE_DESKTOP_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES ${Else} !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO @@ -496,7 +496,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to Sandbox ${If} $DesktopServerState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\High Fidelity @CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES ${Else} !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO @@ -506,11 +506,11 @@ Function HandlePostInstallOptions ${If} $ServerStartupState == ${BST_CHECKED} ; in case we added a shortcut in the global context, pull that now SetShellVarContext all - Delete "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk" + Delete "$SMSTARTUP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" ; make a startup shortcut in this user's current context SetShellVarContext current - CreateShortCut "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" + CreateShortCut "$SMSTARTUP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" ; reset the shell var context back SetShellVarContext all @@ -591,14 +591,16 @@ Section "-Core installation" ; Delete old desktop shortcuts before they were renamed during Sandbox rename Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" - Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" ; Delete old Start Menu shortcuts before Sandbox rename - Delete "$SMPROGRAMS\$STARTMENU_FOLDER\High Fidelity.lnk" - Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Server Console.lnk" + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk" + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" ; Delete old startup item for Server Console before Sandbox rename - Delete "$SMSTARTUP\Server Console.lnk" + SetShellVarContext current + Delete "$SMSTARTUP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" + SetShellVarContext all ; Rename the incorrectly cased Raleway font Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml" @@ -880,12 +882,12 @@ Section "Uninstall" Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" Delete "$SMPROGRAMS\$MUI_TEMP\@INTERFACE_SHORTCUT_NAME@.lnk" Delete "$SMPROGRAMS\$MUI_TEMP\@CONSOLE_SHORTCUT_NAME@.lnk" - Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" - Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" ; if it exists, delete the startup shortcut for the current user SetShellVarContext current - Delete "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk" + Delete "$SMSTARTUP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" SetShellVarContext all @CPACK_NSIS_DELETE_ICONS@ From 8be3931bbf6039e14b4d4b852659b8b44a366966 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:20:31 -0700 Subject: [PATCH 14/21] repair shortcut name for desktop interface --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 8c494620e5..e7ea3dfb2b 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -485,7 +485,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to High Fidelity ${If} $DesktopClientState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\@INTERFACE_DESKTOP_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES ${Else} !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO @@ -590,7 +590,7 @@ Section "-Core installation" Delete "$INSTDIR\xinput1_3.dll" ; Delete old desktop shortcuts before they were renamed during Sandbox rename - Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk" Delete "$DESKTOP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" ; Delete old Start Menu shortcuts before Sandbox rename From 53c16280bdfe24d9e71181baa7a438156fecfca1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:22:57 -0700 Subject: [PATCH 15/21] remove code for stack manager migration --- server-console/src/main.js | 141 ------------------------------------- 1 file changed, 141 deletions(-) diff --git a/server-console/src/main.js b/server-console/src/main.js index b36d798a30..7183edfc25 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -347,134 +347,6 @@ function goHomeClicked() { } } -function stackManagerBasePath() { - var dataPath = 'High Fidelity/Stack Manager/resources'; - - if (process.platform == "win32") { - return path.resolve(osHomeDir(), 'AppData/Local', dataPath); - } else if (process.platform == "darwin") { - return path.resolve(osHomeDir(), 'Library/Application Support', dataPath); - } else { - return "" - } -} - -function isStackManagerContentPresent() { - var modelsPath = path.resolve(stackManagerBasePath(), 'models.json.gz'); - - try { - var stats = fs.lstatSync(modelsPath); - - if (stats.isFile()) { - console.log("Stack Manager entities file discovered at " + modelsPath) - // we found a content file - return true; - } - } catch (e) { - console.log("Stack Manager entities file not found at " + modelsPath); - } -} - -function promptToMigrateContent() { - dialog.showMessageBox({ - type: 'question', - buttons: ['Yes', 'No'], - title: 'Migrate Content', - message: 'Are you sure?\n\nThis will stop your home server and replace everything in your home with your content from Stack Manager.' - }, function(index) { - if (index == 0) { - if (homeServer.state != ProcessGroupStates.STOPPED) { - var stopThenMigrateCallback = function(processGroup) { - if (isShuttingDown) { - homeServer.removeListener('state-update', stopThenMigrateCallback); - } else if (processGroup.state == ProcessGroupStates.STOPPED) { - performContentMigration(); - - homeServer.removeListener('state-update', stopThenMigrateCallback); - } - }; - - homeServer.on('state-update', stopThenMigrateCallback); - homeServer.stop(); - - } else { - performContentMigration(); - } - } - }); -} - -function performContentMigration() { - // check if there is a models file to migrate - var modelsPath = path.resolve(stackManagerBasePath(), 'models.json.gz'); - - try { - var stats = fs.lstatSync(modelsPath); - } catch (e) { - // no entities file - dialog.showMessageBox({ - type: 'info', - buttons: ['OK'], - title: 'Models File Not Found', - message: 'There is no models file at ' + modelsPath + '\n\nStack Manager content migration can not proceed.' - }, null); - - return; - } - - function showMigrationCompletionDialog(copyError) { - if (!copyError) { - // show message for successful migration - dialog.showMessageBox({ - type: 'info', - buttons: ['OK'], - title: 'Migration Complete', - message: 'Your Stack Manager content has been migrated.\n\nYour home server will now be restarted.' - }, null); - } else { - // show error message for copy fail - dialog.showMessageBox({ - type: 'info', - buttons: ['OK'], - title: 'Migration Failed', - message: 'There was an error copying your Stack Manager content: ' + copyError + '\n\nPlease try again.' - }, null); - } - } - - // we have a models file, try and copy it - var newModelsPath = path.resolve(getAssignmentClientResourcesDirectory(), 'entities/models.json.gz') - console.log("Copying Stack Manager entity file from " + modelsPath + " to " + newModelsPath); - - try { - fs.copySync(modelsPath, newModelsPath); - - // check if there are any assets to copy - var oldAssetsPath = path.resolve(stackManagerBasePath(), 'assets'); - - var assets = fs.readdirSync(oldAssetsPath); - - if (assets.length > 0) { - // assume this means the directory is not empty - // and that we should copy it - var newAssetsPath = path.resolve(getAssignmentClientResourcesDirectory(), 'assets'); - - console.log("Copying Stack Manager assets from " + oldAssetsPath + " to " + newAssetsPath); - - // attempt to copy the assets folder - fs.copySync(oldAssetsPath, newAssetsPath, { - preserveTimestamps: true - }); - } - - showMigrationCompletionDialog(null); - } catch (error) { - showMigrationCompletionDialog(error); - } - - homeServer.start(); -} - var logWindow = null; var labels = { @@ -530,12 +402,6 @@ var labels = { shell.openExternal('http://localhost:40100/settings/?action=share') } }, - migrateContent: { - label: 'Migrate Stack Manager Content', - click: function() { - promptToMigrateContent(); - } - }, shuttingDown: { label: "Shutting down...", enabled: false @@ -569,13 +435,6 @@ function buildMenuArray(serverState) { menuArray.push(labels.share); menuArray.push(separator); menuArray.push(labels.quit); - - var foundStackManagerContent = isStackManagerContentPresent(); - if (foundStackManagerContent) { - // add a separator and the stack manager content migration option - menuArray.splice(menuArray.length - 1, 0, labels.migrateContent, separator); - } - } From 7c0c48458e0f3a30aa4e12d55836d50a712036a4 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:25:47 -0700 Subject: [PATCH 16/21] remove padding from stack manager migration block --- server-console/src/splash.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/server-console/src/splash.css b/server-console/src/splash.css index bd3a06cbe3..0782cf5314 100644 --- a/server-console/src/splash.css +++ b/server-console/src/splash.css @@ -125,10 +125,6 @@ h2 { border-bottom: 2px solid #F5F6F6; } -#existing-resources-area { - padding-top: 20px; -} - .footer { padding-top: 34px; } @@ -143,4 +139,4 @@ h2 { input[type="checkbox"] { -webkit-transform: scale(1.4); display: inline-block; -} \ No newline at end of file +} From c2c7ae89db0dd5429925319a78a68fdadd69f032 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:27:44 -0700 Subject: [PATCH 17/21] remove bottom section from server-console splash --- server-console/src/main.js | 2 +- server-console/src/splash.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server-console/src/main.js b/server-console/src/main.js index 7183edfc25..26ec2dd536 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -583,7 +583,7 @@ function maybeShowSplash() { var window = new BrowserWindow({ icon: appIcon, width: 1600 * zoomFactor, - height: 737 * zoomFactor, + height: 650 * zoomFactor, center: true, frame: true, useContentSize: true, diff --git a/server-console/src/splash.css b/server-console/src/splash.css index 0782cf5314..5a911e3872 100644 --- a/server-console/src/splash.css +++ b/server-console/src/splash.css @@ -122,7 +122,6 @@ h2 { #main-content { height: 350px; - border-bottom: 2px solid #F5F6F6; } .footer { From 0a8072164d654599d3a6b0626f1912f7514711b2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:44:16 -0700 Subject: [PATCH 18/21] be less redundant in prompt for running applications --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index e7ea3dfb2b..28cb20dd1c 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -737,8 +737,8 @@ SectionEnd !macroend !macro CheckForRunningApplications action prompter - !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "High Fidelity Interface" ${action} ${prompter} - !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "High Fidelity Sandbox" ${action} ${prompter} + !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "@CONSOLE_SHORTCUT_NAME@" ${action} ${prompter} + !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "@INTERFACE_SHORTCUT_NAME@" ${action} ${prompter} !insertmacro PromptForRunningApplication "@DS_EXEC_NAME@" "Domain Server" ${action} ${prompter} !insertmacro PromptForRunningApplication "@AC_EXEC_NAME@" "Assignment Client" ${action} ${prompter} !macroend From 7d042fc47de5eff20329eeb64298e3ace470bb2d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:54:55 -0700 Subject: [PATCH 19/21] keep server-console as sandbox folder in Program Files --- cmake/macros/SetPackagingParameters.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index ef885df09e..63e7a1a174 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -64,7 +64,7 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns") else () if (WIN32) - set(CONSOLE_INSTALL_DIR "sandbox") + set(CONSOLE_INSTALL_DIR "server-console") else () set(CONSOLE_INSTALL_DIR ".") endif () From f29647b5191214f440a13cc857c0efc1e31c1273 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:56:57 -0700 Subject: [PATCH 20/21] use HF shortcuts for setup options --- cmake/templates/NSIS.template.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 28cb20dd1c..0e30d8aa2a 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -387,7 +387,7 @@ Function PostInstallOptionsPage StrCpy $OffsetUnits u ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for High Fidelity @INTERFACE_SHORTCUT_NAME@" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_HF_SHORTCUT_NAME@" Pop $DesktopClientCheckbox IntOp $CurrentOffset $CurrentOffset + 15 @@ -396,7 +396,7 @@ Function PostInstallOptionsPage ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for High Fidelity @CONSOLE_SHORTCUT_NAME@" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @CONSOLE_HF_SHORTCUT_NAME@" Pop $DesktopServerCheckbox ; set the checkbox state depending on what is present in the registry @@ -404,7 +404,7 @@ Function PostInstallOptionsPage IntOp $CurrentOffset $CurrentOffset + 15 - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ on startup" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ on startup" Pop $ServerStartupCheckbox ; set the checkbox state depending on what is present in the registry @@ -414,9 +414,9 @@ Function PostInstallOptionsPage ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ after install" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ after install" ${Else} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @INTERFACE_SHORTCUT_NAME@ after install" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @INTERFACE_HF_SHORTCUT_NAME@ after install" ${EndIf} Pop $LaunchNowCheckbox From b6853a0679d64aff3afaae02dbae400981087a98 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 14:47:40 -0700 Subject: [PATCH 21/21] fix packaged server console folder for OS X --- server-console/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-console/CMakeLists.txt b/server-console/CMakeLists.txt index 9a96b07442..1c6e40c582 100644 --- a/server-console/CMakeLists.txt +++ b/server-console/CMakeLists.txt @@ -23,7 +23,7 @@ add_dependencies(${TARGET_NAME} assignment-client domain-server) # set the packaged console folder depending on platform, so we can copy it if (APPLE) - set(PACKAGED_CONSOLE_FOLDER "Server\\ Console-darwin-x64/${CONSOLE_EXEC_NAME}") + set(PACKAGED_CONSOLE_FOLDER "Sandbox-darwin-x64/${CONSOLE_EXEC_NAME}") elseif (WIN32) set(PACKAGED_CONSOLE_FOLDER "server-console-win32-x64") elseif (UNIX)