diff --git a/cmake/macros/ConsolidateInstallerComponents.cmake b/cmake/macros/ConsolidateInstallerComponents.cmake index 6afa1de737..661c2aad3f 100644 --- a/cmake/macros/ConsolidateInstallerComponents.cmake +++ b/cmake/macros/ConsolidateInstallerComponents.cmake @@ -15,7 +15,7 @@ macro(CONSOLIDATE_INSTALLER_COMPONENTS) # add a command to copy the folder produced by electron-packager to package-bundle add_custom_command( TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/High\ Fidelity-* ${CMAKE_BINARY_DIR}/package-bundle + COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/High\ Fidelity\ Console-* ${CMAKE_BINARY_DIR}/package-bundle ) else () # add a command to copy the fixed up binary and libraries to package-bundle diff --git a/console/package.json b/console/package.json index 2d796e01e9..ee812cbec8 100644 --- a/console/package.json +++ b/console/package.json @@ -20,9 +20,9 @@ "scripts": { "start": "electron . --local-debug-builds --debug", "local-release": "electron . --local-release-builds --debug", - "package-darwin": "electron-packager . High\\ Fidelity --overwrite --prune --platform=darwin --arch=x64 --version=0.35.4 --icon=resources/console.icns", - "package-win": "electron-packager . High\\ Fidelity --overwrite --prune --platform=win32 --arch=x64 --version=0.35.4 --icon=resources/console.ico", - "package-linux": "electron-packager . High\\ Fidelity --overwrite --prune --platform=linux --arch=x64 --version=0.35.4" + "package-darwin": "electron-packager . High\\ Fidelity\\ Console --overwrite --prune --platform=darwin --arch=x64 --version=0.35.4 --icon=resources/console.icns", + "package-win": "electron-packager . High\\ Fidelity\\ Console --overwrite --prune --platform=win32 --arch=x64 --version=0.35.4 --icon=resources/console.ico", + "package-linux": "electron-packager . High\\ Fidelity\\ Console --overwrite --prune --platform=linux --arch=x64 --version=0.35.4" }, "dependencies": { "extend": "^3.0.0", diff --git a/tools/nsis/release.nsi b/tools/nsis/release.nsi index 5e711a3454..c2b606d7ca 100644 --- a/tools/nsis/release.nsi +++ b/tools/nsis/release.nsi @@ -24,7 +24,7 @@ !define company "$%INSTALLER_COMPANY%" !define install_directory "$%INSTALLER_DIRECTORY%" -; Executables and icons for GUI applications that will be added as shortcuts. +; Executables and icons for GUI applications that will be added as shortcuts. !define interface_exec "interface.exe" !define stack_manager_exec "stack-manager.exe" !define interface_icon "interface.ico" @@ -103,15 +103,15 @@ Section "Base Files" "BASE" File /r /x assignment-client.* /x domain-server.* /x interface.* /x stack-manager.* "${installer_srcdir}\" SectionEnd -Section "HighFidelity Interface" "CLIENT" +Section "High Fidelity Interface" "CLIENT" SetOutPath $ChosenInstallDir File /a "${installer_srcdir}\interface.*" File /a "${installer_srcdir}\${interface_icon}" SectionEnd -Section "HighFidelity Server" "SERVER" +Section "High Fidelity Server" "SERVER" SetOutPath $ChosenInstallDir - File /a "${installer_srcdir}\stack-manager.*" + File /a "${installer_srcdir}\High\ Fidelity\ Console.*" File /a "${installer_srcdir}\domain-server.*" File /a "${installer_srcdir}\assignment-client.*" File /a "${installer_srcdir}\${stack_manager_icon}"