aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2023-01-24 20:41:38 +0100
committerGitHub <[email protected]>2023-01-24 20:41:38 +0100
commit8da2da29f5667839cbdeedbf549844ecba9e64d4 (patch)
tree3c9c0ed269815d0964eee564c1d171180f800e2a
parentfix gc logging (#213) (diff)
downloadzen-8da2da29f5667839cbdeedbf549844ecba9e64d4.tar.xz
zen-8da2da29f5667839cbdeedbf549844ecba9e64d4.zip
Added version information to server executable (#215)
This change adds some version and product information to the Windows executable, in order to make it easier for users to understand the purpose of the zenserver.exe process when they see it in Task Manager and on disk It also adds back the executable icon which was lost when we transitioned from the previous sln build process
-rw-r--r--zen/xmake.lua2
-rw-r--r--zen/zen.rc33
-rw-r--r--zenserver/xmake.lua1
-rw-r--r--zenserver/zenserver.rc24
4 files changed, 60 insertions, 0 deletions
diff --git a/zen/xmake.lua b/zen/xmake.lua
index 6f4d74f0e..c4ef713bb 100644
--- a/zen/xmake.lua
+++ b/zen/xmake.lua
@@ -15,8 +15,10 @@ target("zen")
if is_plat("windows") then
add_ldflags("/subsystem:console,5.02")
add_ldflags("/LTCG")
+ add_files("zen.rc")
end
+
if is_plat("macosx") then
add_ldflags("-framework CoreFoundation")
add_ldflags("-framework Security")
diff --git a/zen/zen.rc b/zen/zen.rc
new file mode 100644
index 000000000..14a9afb70
--- /dev/null
+++ b/zen/zen.rc
@@ -0,0 +1,33 @@
+#include "zencore/config.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+101 ICON "..\\UnrealEngine.ico"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION ZEN_CFG_VERSION_MAJOR,ZEN_CFG_VERSION_MINOR,ZEN_CFG_VERSION_ALTER,0
+PRODUCTVERSION ZEN_CFG_VERSION_MAJOR,ZEN_CFG_VERSION_MINOR,ZEN_CFG_VERSION_ALTER,0
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904b0"
+ {
+ VALUE "CompanyName", "Epic Games Inc\0"
+ VALUE "FileDescription", "CLI utility for Zen Storage Service\0"
+ VALUE "FileVersion", ZEN_CFG_VERSION "\0"
+ VALUE "LegalCopyright", "Copyright Epic Games Inc. All Rights Reserved\0"
+ VALUE "OriginalFilename", "zen.exe\0"
+ VALUE "ProductName", "Zen Storage Server\0"
+ VALUE "ProductVersion", ZEN_CFG_VERSION_BUILD_STRING_FULL "\0"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+}
diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua
index 2174ad679..f5b428eac 100644
--- a/zenserver/xmake.lua
+++ b/zenserver/xmake.lua
@@ -16,6 +16,7 @@ target("zenserver")
add_ldflags("/subsystem:console,5.02")
add_ldflags("/MANIFEST:EMBED")
add_ldflags("/LTCG")
+ add_files("zenserver.rc")
else
remove_files("windows/**")
end
diff --git a/zenserver/zenserver.rc b/zenserver/zenserver.rc
index c063436ef..6d31e2c6e 100644
--- a/zenserver/zenserver.rc
+++ b/zenserver/zenserver.rc
@@ -2,6 +2,8 @@
//
#include "resource.h"
+#include "zencore/config.h"
+
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
@@ -79,3 +81,25 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION ZEN_CFG_VERSION_MAJOR,ZEN_CFG_VERSION_MINOR,ZEN_CFG_VERSION_ALTER,0
+PRODUCTVERSION ZEN_CFG_VERSION_MAJOR,ZEN_CFG_VERSION_MINOR,ZEN_CFG_VERSION_ALTER,0
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904b0"
+ {
+ VALUE "CompanyName", "Epic Games Inc\0"
+ VALUE "FileDescription", "Local Storage Service for Unreal Engine\0"
+ VALUE "FileVersion", ZEN_CFG_VERSION "\0"
+ VALUE "LegalCopyright", "Copyright Epic Games Inc. All Rights Reserved\0"
+ VALUE "OriginalFilename", "zenserver.exe\0"
+ VALUE "ProductName", "Zen Storage Server\0"
+ VALUE "ProductVersion", ZEN_CFG_VERSION_BUILD_STRING_FULL "\0"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+}