summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/Glacier2Router.rc37
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc41
-rw-r--r--cpp/src/Glacier2Lib/Glacier2.rc42
-rw-r--r--cpp/src/Ice/Ice.rc41
-rw-r--r--cpp/src/IceBox/IceBox.rc41
-rw-r--r--cpp/src/IceBox/IceBoxAdmin.rc37
-rw-r--r--cpp/src/IceBox/IceBoxExe.rc41
-rw-r--r--cpp/src/IceDB/IceDB.rc41
-rwxr-xr-xcpp/src/IceDiscovery/IceDiscovery.rc41
-rw-r--r--cpp/src/IceGrid/IceGridAdmin.rc37
-rw-r--r--cpp/src/IceGrid/IceGridNode.rc37
-rw-r--r--cpp/src/IceGrid/IceGridRegistry.rc37
-rw-r--r--cpp/src/IceGridLib/IceGrid.rc41
-rwxr-xr-xcpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc41
-rw-r--r--cpp/src/IcePatch2/IcePatch2Calc.rc37
-rw-r--r--cpp/src/IcePatch2/IcePatch2Client.rc37
-rw-r--r--cpp/src/IcePatch2/IcePatch2Server.rc37
-rw-r--r--cpp/src/IcePatch2Lib/IcePatch2.rc41
-rw-r--r--cpp/src/IceSSL/IceSSL.rc41
-rw-r--r--cpp/src/IceStorm/IceStormAdmin.rc37
-rw-r--r--cpp/src/IceStorm/IceStormDB.rc37
-rw-r--r--cpp/src/IceStorm/IceStormService.rc41
-rw-r--r--cpp/src/IceStormLib/IceStorm.rc41
-rw-r--r--cpp/src/IceXML/IceXML.rc41
-rw-r--r--cpp/src/icegriddb/IceGridDB.rc37
-rw-r--r--cpp/src/iceserviceinstall/IceServiceInstall.rc37
-rw-r--r--cpp/src/slice2confluence/Slice2Confluence.rc37
-rw-r--r--cpp/src/slice2cpp/Slice2Cpp.rc37
-rw-r--r--cpp/src/slice2cs/Slice2Cs.rc37
-rw-r--r--cpp/src/slice2html/Slice2Html.rc37
-rw-r--r--cpp/src/slice2java/Slice2Java.rc37
-rw-r--r--cpp/src/slice2js/Slice2Js.rc37
-rw-r--r--cpp/src/slice2php/Slice2PHP.rc37
-rw-r--r--cpp/src/slice2py/Slice2Py.rc39
34 files changed, 615 insertions, 702 deletions
diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc
index c39044c8c1d..ab3bb728eb8 100644
--- a/cpp/src/Glacier2/Glacier2Router.rc
+++ b/cpp/src/Glacier2/Glacier2Router.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "glacier2router\0"
+#define ICE_ORIGINALFILENAME "glacier2router.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Glacier2 Router\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "glacier2router\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "glacier2router.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
index 7b1f983d3a4..8e42657c826 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("glacier2cryptpermissionsverifier") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("glacier2cryptpermissionsverifier") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "glacier2cryptpermissionsverifier35d\0"
- #define ORIGINALFILENAME "glacier2cryptpermissionsverifier35d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "glacier2cryptpermissionsverifier35\0"
- #define ORIGINALFILENAME "glacier2cryptpermissionsverifier35.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Glacier2CryptPermissionsVerifier C++ Plug-in\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc
index d0e0adc9ffe..450677e0604 100644
--- a/cpp/src/Glacier2Lib/Glacier2.rc
+++ b/cpp/src/Glacier2Lib/Glacier2.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("glacier2") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("glacier2") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "glacier237a4d\0"
- #define ORIGINALFILENAME "glacier237a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "glacier237a4\0"
- #define ORIGINALFILENAME "glacier237a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Glacier2 C++ Client Library\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
@@ -36,3 +31,4 @@ BEGIN
VALUE "Translation", 0x409, 1252
END
END
+
diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc
index 400839c8768..dbbe42ea3d0 100644
--- a/cpp/src/Ice/Ice.rc
+++ b/cpp/src/Ice/Ice.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("ice") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("ice") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "ice37a4d\0"
- #define ORIGINALFILENAME "ice37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "ice37a4\0"
- #define ORIGINALFILENAME "ice37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Ice C++ Core Library\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc
index 11f8f6903f2..3327c4ed963 100644
--- a/cpp/src/IceBox/IceBox.rc
+++ b/cpp/src/IceBox/IceBox.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icebox") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icebox") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icebox37a4d\0"
- #define ORIGINALFILENAME "icebox37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icebox37a4\0"
- #define ORIGINALFILENAME "icebox37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceBox C++ Library\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc
index 4fa4b2fce68..eb6356774b4 100644
--- a/cpp/src/IceBox/IceBoxAdmin.rc
+++ b/cpp/src/IceBox/IceBoxAdmin.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "iceboxadmin\0"
+#define ICE_ORIGINALFILENAME "iceboxadmin.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceBox Admin\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "iceboxadmin\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "iceboxadmin.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc
index 7d6ad006cf3..bf2a31ba226 100644
--- a/cpp/src/IceBox/IceBoxExe.rc
+++ b/cpp/src/IceBox/IceBoxExe.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icebox\0"
+#define ICE_ORIGINALFILENAME "icebox.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "iceboxd\0"
- #define ORIGINALFILENAME "iceboxd.exe\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icebox\0"
- #define ORIGINALFILENAME "icebox.exe\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceBox C++ Server\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceDB/IceDB.rc b/cpp/src/IceDB/IceDB.rc
index 0c5f8941a03..c51ded2b9d0 100644
--- a/cpp/src/IceDB/IceDB.rc
+++ b/cpp/src/IceDB/IceDB.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icedb") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icedb") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icedb37a4d\0"
- #define ORIGINALFILENAME "icedb37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icedb37a4\0"
- #define ORIGINALFILENAME "icedb37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceDB C++ Library\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceDiscovery/IceDiscovery.rc b/cpp/src/IceDiscovery/IceDiscovery.rc
index 6bcb16999f6..efca250687c 100755
--- a/cpp/src/IceDiscovery/IceDiscovery.rc
+++ b/cpp/src/IceDiscovery/IceDiscovery.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icediscovery") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icediscovery") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icediscovery37a4d\0"
- #define ORIGINALFILENAME "icediscovery37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icediscovery37a4\0"
- #define ORIGINALFILENAME "icediscovery37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceDiscovery C++ Plug-in\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc
index bf26826c8d1..383e0dd3751 100644
--- a/cpp/src/IceGrid/IceGridAdmin.rc
+++ b/cpp/src/IceGrid/IceGridAdmin.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icegridadmin\0"
+#define ICE_ORIGINALFILENAME "icegridadmin.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceGrid Admin\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "icegridadmin\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "icegridadmin.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc
index 9b5a2981b29..47a67b1cad2 100644
--- a/cpp/src/IceGrid/IceGridNode.rc
+++ b/cpp/src/IceGrid/IceGridNode.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icegridnode\0"
+#define ICE_ORIGINALFILENAME "icegridnode.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceGrid Node\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "icegridnode\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "icegridnode.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc
index 6b0517c40ea..ba598c02ff6 100644
--- a/cpp/src/IceGrid/IceGridRegistry.rc
+++ b/cpp/src/IceGrid/IceGridRegistry.rc
@@ -1,30 +1,31 @@
#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icegridregistry\0"
+#define ICE_ORIGINALFILENAME "icegridregistry.exe\0"
+
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceGrid Registry\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "icegridregistry\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "icegridregistry.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc
index b367c3debe0..bc9c016aeff 100644
--- a/cpp/src/IceGridLib/IceGrid.rc
+++ b/cpp/src/IceGridLib/IceGrid.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icegrid") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icegrid") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegrid37a4d\0"
- #define ORIGINALFILENAME "icegrid37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icegrid37a4\0"
- #define ORIGINALFILENAME "icegrid37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceGrid C++ Client Library\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc
index db37dd55393..2b10e57e576 100755
--- a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc
+++ b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icelocatordiscovery") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icelocatordiscovery") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icelocatordiscovery37a4d\0"
- #define ORIGINALFILENAME "icelocatordiscovery37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icelocatordiscovery37a4\0"
- #define ORIGINALFILENAME "icelocatordiscovery37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceLocatorDiscovery C++ Plug-in\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc
index dbba027d4a5..638dfd6522a 100644
--- a/cpp/src/IcePatch2/IcePatch2Calc.rc
+++ b/cpp/src/IcePatch2/IcePatch2Calc.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icepatch2calc\0"
+#define ICE_ORIGINALFILENAME "icepatch2calc.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IcePatch2 Calc\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "icepatch2calc\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "icepatch2calc.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc
index a4c75e5ef25..a75a27dac0d 100644
--- a/cpp/src/IcePatch2/IcePatch2Client.rc
+++ b/cpp/src/IcePatch2/IcePatch2Client.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icepatch2client\0"
+#define ICE_ORIGINALFILENAME "icepatch2client.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IcePatch2 Client\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "icepatch2client\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "icepatch2client.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc
index 34fc5684488..4af7f9949fe 100644
--- a/cpp/src/IcePatch2/IcePatch2Server.rc
+++ b/cpp/src/IcePatch2/IcePatch2Server.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icepatch2server\0"
+#define ICE_ORIGINALFILENAME "icepatch2server.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IcePatch2 Server\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "icepatch2server\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "icepatch2server.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc
index 01173809611..763fa2dd0b5 100644
--- a/cpp/src/IcePatch2Lib/IcePatch2.rc
+++ b/cpp/src/IcePatch2Lib/IcePatch2.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icepatch2") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icepatch2") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icepatch237a4d\0"
- #define ORIGINALFILENAME "icepatch237a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icepatch237a4\0"
- #define ORIGINALFILENAME "icepatch237a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IcePatch2 Client Library\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc
index 260f72fb084..698f13ebc93 100644
--- a/cpp/src/IceSSL/IceSSL.rc
+++ b/cpp/src/IceSSL/IceSSL.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icessl") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icessl") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icessl37a4d\0"
- #define ORIGINALFILENAME "icessl37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icessl37a4\0"
- #define ORIGINALFILENAME "icessl37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceSSL C++ Plug-in\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc
index b7fdbae4d2d..117e89cbb47 100644
--- a/cpp/src/IceStorm/IceStormAdmin.rc
+++ b/cpp/src/IceStorm/IceStormAdmin.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icestormadmin\0"
+#define ICE_ORIGINALFILENAME "icestormadmin.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceStorm Admin\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "icestormadmin\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "icestormadmin.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc
index 07129ae7075..2b4697b731f 100644
--- a/cpp/src/IceStorm/IceStormDB.rc
+++ b/cpp/src/IceStorm/IceStormDB.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icestormdb\0"
+#define ICE_ORIGINALFILENAME "icestormdb.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceStormDB\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "icestormdb\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "icestormdb.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc
index 719a37613dc..f420a5776b5 100644
--- a/cpp/src/IceStorm/IceStormService.rc
+++ b/cpp/src/IceStorm/IceStormService.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icestormservice") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icestormservice") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormservice37a4d\0"
- #define ORIGINALFILENAME "icestormservice37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icestormservice37a4\0"
- #define ORIGINALFILENAME "icestormservice37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceStorm C++ Service for IceBox\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc
index 2587be5b55c..067e420d8ce 100644
--- a/cpp/src/IceStormLib/IceStorm.rc
+++ b/cpp/src/IceStormLib/IceStorm.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icestorm") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icestorm") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestorm37a4d\0"
- #define ORIGINALFILENAME "icestorm37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icestorm37a4\0"
- #define ORIGINALFILENAME "icestorm37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceStorm C++ Client Library\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc
index 398de9b8bba..f10ae1a8e1a 100644
--- a/cpp/src/IceXML/IceXML.rc
+++ b/cpp/src/IceXML/IceXML.rc
@@ -1,34 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME ICE_LIBNAME("icexml") "\0"
+#define ICE_ORIGINALFILENAME ICE_LIBNAME("icexml") ".dll\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icexml37a4d\0"
- #define ORIGINALFILENAME "icexml37a4d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icexml37a4\0"
- #define ORIGINALFILENAME "icexml37a4.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceXML C++ Library\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", INTERNALNAME
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", ORIGINALFILENAME
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/icegriddb/IceGridDB.rc b/cpp/src/icegriddb/IceGridDB.rc
index 78d8092619b..3419a239fbd 100644
--- a/cpp/src/icegriddb/IceGridDB.rc
+++ b/cpp/src/icegriddb/IceGridDB.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "icegriddb\0"
+#define ICE_ORIGINALFILENAME "icegriddb.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "IceGridDB\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "icegriddb\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "icegriddb.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc
index 9333251133b..6d1a77c47d5 100644
--- a/cpp/src/iceserviceinstall/IceServiceInstall.rc
+++ b/cpp/src/iceserviceinstall/IceServiceInstall.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "iceserviceinstall\0"
+#define ICE_ORIGINALFILENAME "iceserviceinstall.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Install Ice Services as Windows Services\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "iceserviceinstall\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "iceserviceinstall.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc
index 97370a04752..05423b4c2df 100644
--- a/cpp/src/slice2confluence/Slice2Confluence.rc
+++ b/cpp/src/slice2confluence/Slice2Confluence.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2confluence\0"
+#define ICE_ORIGINALFILENAME "slice2confluence.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Slice to Confluence Markup Translator\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "slice2confluence\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "slice2confluence.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc
index d785056b047..bf20a8dafb7 100644
--- a/cpp/src/slice2cpp/Slice2Cpp.rc
+++ b/cpp/src/slice2cpp/Slice2Cpp.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2cpp\0"
+#define ICE_ORIGINALFILENAME "slice2cpp.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Slice to C++ Translator\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "slice2cpp\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "slice2cpp.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc
index f5a09a5887d..676e449fbb0 100644
--- a/cpp/src/slice2cs/Slice2Cs.rc
+++ b/cpp/src/slice2cs/Slice2Cs.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2cs\0"
+#define ICE_ORIGINALFILENAME "slice2cs.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Slice to C# Translator\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "slice2cs\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "slice2cs.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc
index a3108fc7b1c..325317d9119 100644
--- a/cpp/src/slice2html/Slice2Html.rc
+++ b/cpp/src/slice2html/Slice2Html.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2html\0"
+#define ICE_ORIGINALFILENAME "slice2html.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Slice to HTML Translator\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "slice2html\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "slice2html.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc
index 984c17e126e..3de407fb594 100644
--- a/cpp/src/slice2java/Slice2Java.rc
+++ b/cpp/src/slice2java/Slice2Java.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2java\0"
+#define ICE_ORIGINALFILENAME "slice2java.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Slice to Java Translator\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "slice2java\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "slice2java.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2js/Slice2Js.rc b/cpp/src/slice2js/Slice2Js.rc
index f468ab1263d..82a88bfd8dc 100644
--- a/cpp/src/slice2js/Slice2Js.rc
+++ b/cpp/src/slice2js/Slice2Js.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2js\0"
+#define ICE_ORIGINALFILENAME "slice2js.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Slice to JavaScript Translator\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "slice2js\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "slice2js.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc
index 96d5e540713..a8cab8e5b62 100644
--- a/cpp/src/slice2php/Slice2PHP.rc
+++ b/cpp/src/slice2php/Slice2PHP.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2php\0"
+#define ICE_ORIGINALFILENAME "slice2php.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
VALUE "FileDescription", "Slice to PHP Translator\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "slice2php\0"
- VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
- VALUE "OriginalFilename", "slice2php.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc
index 98505cd45d8..916b4be8d9f 100644
--- a/cpp/src/slice2py/Slice2Py.rc
+++ b/cpp/src/slice2py/Slice2Py.rc
@@ -1,30 +1,29 @@
-#include "winver.h"
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2py\0"
+#define ICE_ORIGINALFILENAME "slice2py.exe\0"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,54,0
- PRODUCTVERSION 3,7,54,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
- VALUE "FileDescription", "Slice To Python Translator\0"
- VALUE "FileVersion", "3.7a4\0"
- VALUE "InternalName", "slice2py\0"
- VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\0"
- VALUE "OriginalFilename", "slice2py.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.7a4\0"
+ VALUE "CompanyName", ICE_COMPANY_NAME
+ VALUE "FileDescription", "Slice to Python Translator\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
END
END
BLOCK "VarFileInfo"