win32: Fix #7373 binaries are tagged with correct ressource

diff --git a/bacula/src/win32/libwin32/bacula.rc b/bacula/src/win32/libwin32/bacula.rc
index 939523b8ea2019181b997a53b3c6501d5871bc9c..84cdd69ab25bf7fea7309028e0acbed139acef58 100644 (file)
--- a/bacula/src/win32/libwin32/bacula.rc
+++ b/bacula/src/win32/libwin32/bacula.rc
@@ -60,49 +60,52 @@ END
 /********************************************************************
  *
  * Version
- *
+ */
 
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
- FILEFLAGS 0x1L
+#define FILEFLAGS_ARG VS_FF_DEBUG
 #else
- FILEFLAGS 0
+#define FILEFLAGS_ARG 0x0L
 #endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE 0
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E0" // Lang=US English, CharSet=Windows Multiligual
-        BEGIN
-            VALUE "Comments", "by Kern Sibbald\0"
-            VALUE "CompanyName", "Bacula\0"
 #ifdef _WIN64
-            VALUE "FileDescription", "Bacula File daemon for Win64\0"
-            VALUE "ProductName", "Bacula(R) - Win64 Version\0"
+#define FILEDESCRIPTION_ARG "Bacula(R) File daemon for Win64\0"
+#define PRODUCTNAME_ARG "Bacula(R) - Win64 Version\0"
 #else
-            VALUE "FileDescription", "Bacula File daemon for Win32\0"
-            VALUE "ProductName", "Bacula(R) - Win32 Version\0"
+#define FILEDESCRIPTION_ARG "Bacula(R) File daemon for Win32\0"
+#define PRODUCTNAME_ARG "Bacula(R) - Win32 Version\0"
 #endif
-            VALUE "FileVersion", VERSION "\0"
-            VALUE "InternalName", "Bacula\0"
-            VALUE "LegalCopyright", "Copyright Kern Sibbald, 2000-2020\0"
-            VALUE "LegalTrademarks", "Bacula(R)\0"
-            VALUE "OriginalFilename", "bacula-fd.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductVersion", VERSION
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252 // US English, Multilingual
-    END
-END
+
+VS_VERSION_INFO VERSIONINFO
+       FILEVERSION VER_MAJOR,VER_MINOR,VER_BUILD,VER_REVISION
+       PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_BUILD,VER_REVISION
+       FILEFLAGSMASK 0x3fL
+       FILEFLAGS FILEFLAGS_ARG
+       FILEOS VOS_NT_WINDOWS32
+       FILETYPE VFT_APP
+       FILESUBTYPE 0x0L
+       BEGIN
+               BLOCK "StringFileInfo"
+               BEGIN
+                       BLOCK "040904e0"
+                       BEGIN
+                               VALUE "Comments", "by Kern Sibbald\0"
+                               VALUE "CompanyName", "Bacula Systems(R) SA\0"
+                               VALUE "FileDescription", FILEDESCRIPTION_ARG
+                               VALUE "ProductName", PRODUCTNAME_ARG
+                               VALUE "FileVersion", VERSION
+                               VALUE "InternalName", "Bacula\0"
+                               VALUE "LegalCopyright", "Copyright (C) 1999-2021 Kern Sibbald.\0"
+                               VALUE "LegalTrademarks", "Bacula Systems(R)\0"
+                               VALUE "ProductVersion", VERSION
+                       END
+               END
+               BLOCK "VarFileInfo"
+               BEGIN
+                       VALUE "Translation", 0x0409, 1252
+               END
+       END
+/* End of Version info */
+
 
 
 /***********************************************************************