From b7f5fc2516393404786e8b17d01e9f00fdaa8575 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Nov 2016 08:58:29 -0700 Subject: [PATCH 1/4] Update 'Sandbox' to 'High Fidelity Sandbox' in task manager --- 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 bc3b8989d2..89bcd7cb71 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -37,7 +37,7 @@ if (osType == "Darwin") { } else if (osType == "Windows_NT") { options["version-string"] = { CompanyName: "High Fidelity, Inc.", - FileDescription: SHORT_NAME, + FileDescription: FULL_NAME, ProductName: FULL_NAME, OriginalFilename: EXEC_NAME + ".exe" } From ea31a8e3b47d4a6e7c23b387d4671c5c70dd99dd Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Nov 2016 08:59:56 -0700 Subject: [PATCH 2/4] Add VersionInfo.rc.in --- cmake/templates/VersionInfo.rc.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 cmake/templates/VersionInfo.rc.in diff --git a/cmake/templates/VersionInfo.rc.in b/cmake/templates/VersionInfo.rc.in new file mode 100644 index 0000000000..1d7b3fa585 --- /dev/null +++ b/cmake/templates/VersionInfo.rc.in @@ -0,0 +1,22 @@ +// Language and character set information as described at +// https://msdn.microsoft.com/en-us/library/windows/desktop/aa381049(v=vs.85).aspx +#define US_ENGLISH_UNICODE "040904B0" + +// More information about the format of this file can be found at +// https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx +1 VERSIONINFO +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK US_ENGLISH_UNICODE + BEGIN + VALUE "CompanyName", "@BUILD_ORGANIZATION@" + VALUE "FileDescription", "@APP_FULL_NAME@" + VALUE "FileVersion", "@BUILD_VERSION@" + VALUE "InternalName", "@TARGET_NAME@" + VALUE "OriginalFilename", "@EXE_NAME@" + VALUE "ProductName", "@APP_FULL_NAME@" + VALUE "ProductVersion", "@BUILD_VERSION@" + END + END +END From 0cc98d4501e6d009d071fda0b262d3ecb9a7a28d Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Nov 2016 09:00:08 -0700 Subject: [PATCH 3/4] Add VersionInfo.rc to interface --- interface/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index b43376c374..f3d684abf1 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -133,8 +133,13 @@ elseif (WIN32) set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc") configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT}) + set(APP_FULL_NAME "High Fidelity Interface") + set(EXE_NAME "interface.exe") + set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc") + configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT}) + # add an executable that also has the icon itself and the configured rc file as resources - add_executable(${TARGET_NAME} WIN32 ${INTERFACE_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT}) + add_executable(${TARGET_NAME} WIN32 ${INTERFACE_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT} ${CONFIGURE_VERSION_INFO_RC_OUTPUT}) if (NOT DEV_BUILD) add_custom_command( From 5f8cee787fa06a9e84d44395c1ef71553c3ca667 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Nov 2016 09:07:56 -0700 Subject: [PATCH 4/4] Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename --- cmake/templates/VersionInfo.rc.in | 2 +- interface/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/templates/VersionInfo.rc.in b/cmake/templates/VersionInfo.rc.in index 1d7b3fa585..ad192ed87d 100644 --- a/cmake/templates/VersionInfo.rc.in +++ b/cmake/templates/VersionInfo.rc.in @@ -14,7 +14,7 @@ BEGIN VALUE "FileDescription", "@APP_FULL_NAME@" VALUE "FileVersion", "@BUILD_VERSION@" VALUE "InternalName", "@TARGET_NAME@" - VALUE "OriginalFilename", "@EXE_NAME@" + VALUE "OriginalFilename", "@TARGET_NAME@.exe" VALUE "ProductName", "@APP_FULL_NAME@" VALUE "ProductVersion", "@BUILD_VERSION@" END diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index f3d684abf1..131c4ee509 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -134,7 +134,6 @@ elseif (WIN32) configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT}) set(APP_FULL_NAME "High Fidelity Interface") - set(EXE_NAME "interface.exe") set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc") configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT})