From db772fc3fecd2b0c6df65a1a84c0546bb1dbd503 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Wed, 26 Sep 2018 15:39:45 -0700
Subject: [PATCH] Update console name for osx build

---
 cmake/macros/GenerateInstallers.cmake     | 6 +++---
 cmake/macros/InstallBesideConsole.cmake   | 4 ++--
 cmake/macros/SetPackagingParameters.cmake | 2 +-
 server-console/CMakeLists.txt             | 2 +-
 server-console/package.json               | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index acafd9b6c7..64919172f7 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -20,9 +20,9 @@ macro(GENERATE_INSTALLERS)
     set(INSTALLER_TYPE "client_only")
     string(REGEX REPLACE "High Fidelity" "High Fidelity Interface" _DISPLAY_NAME ${BUILD_ORGANIZATION})
   elseif (SERVER_ONLY)
-    set(_PACKAGE_NAME_EXTRA "-Sandbox")
+    set(_PACKAGE_NAME_EXTRA "-Console")
     set(INSTALLER_TYPE "server_only")
-    string(REGEX REPLACE "High Fidelity" "High Fidelity Sandbox" _DISPLAY_NAME ${BUILD_ORGANIZATION})
+    string(REGEX REPLACE "High Fidelity" "High Fidelity Console" _DISPLAY_NAME ${BUILD_ORGANIZATION})
   else ()
     set(_DISPLAY_NAME ${BUILD_ORGANIZATION})
     set(INSTALLER_TYPE "full")
@@ -122,7 +122,7 @@ macro(GENERATE_INSTALLERS)
   endif ()
 
   if (BUILD_SERVER)
-    cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Sandbox")
+    cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Console")
   endif ()
 
   include(CPack)
diff --git a/cmake/macros/InstallBesideConsole.cmake b/cmake/macros/InstallBesideConsole.cmake
index 3c991acf86..e3186501f4 100644
--- a/cmake/macros/InstallBesideConsole.cmake
+++ b/cmake/macros/InstallBesideConsole.cmake
@@ -66,8 +66,8 @@ macro(install_beside_console)
       install(CODE "
         set(MACOSX_BUNDLE_EXECUTABLE_NAME domain-server)
         set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.server-components)
-        set(MACOSX_BUNDLE_BUNDLE_NAME Sandbox\\ Components)
-        configure_file(${HF_CMAKE_DIR}/templates/MacOSXBundleSandboxComponentsInfo.plist.in ${ESCAPED_BUNDLE_NAME}/Contents/Info.plist)
+        set(MACOSX_BUNDLE_BUNDLE_NAME Console\\ Components)
+        configure_file(${HF_CMAKE_DIR}/templates/MacOSXBundleConsoleComponentsInfo.plist.in ${ESCAPED_BUNDLE_NAME}/Contents/Info.plist)
         execute_process(COMMAND ${MACDEPLOYQT_COMMAND} ${ESCAPED_BUNDLE_NAME} -verbose=2 -executable=${ESCAPED_EXECUTABLE_NAME})"
         COMPONENT ${SERVER_COMPONENT}
       )
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 164d326b20..aaba3bc201 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -142,7 +142,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
     set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
 
-    set(CONSOLE_EXEC_NAME "Sandbox.app")
+    set(CONSOLE_EXEC_NAME "Console.app")
     set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}")
 
     set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")
diff --git a/server-console/CMakeLists.txt b/server-console/CMakeLists.txt
index 16189dff9d..df51409151 100644
--- a/server-console/CMakeLists.txt
+++ b/server-console/CMakeLists.txt
@@ -23,7 +23,7 @@ add_dependencies(${TARGET_NAME} assignment-client domain-server interface)
 
 # set the packaged console folder depending on platform, so we can copy it
 if (APPLE)
-  set(PACKAGED_CONSOLE_FOLDER "Sandbox-darwin-x64/${CONSOLE_EXEC_NAME}")
+  set(PACKAGED_CONSOLE_FOLDER "Console-darwin-x64/${CONSOLE_EXEC_NAME}")
 elseif (WIN32)
   set(PACKAGED_CONSOLE_FOLDER "server-console-win32-x64")
 elseif (UNIX)
diff --git a/server-console/package.json b/server-console/package.json
index 565658702b..b0d181c65a 100644
--- a/server-console/package.json
+++ b/server-console/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "HighFidelitySandbox",
-  "description": "High Fidelity Sandbox",
+  "name": "HighFidelityConsole",
+  "description": "High Fidelity Console",
   "author": "High Fidelity",
   "license": "Apache-2.0",
   "version": "1.0.0",