diff options
74 files changed, 275 insertions, 275 deletions
diff --git a/android/gradle.properties b/android/gradle.properties index e466ed3a046..8500787f822 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -7,7 +7,7 @@ // // ********************************************************************** -iceVersion = 3.7.0 +iceVersion = 3.7.0-alpha0 // The Android versions used for the Ice build. ice_buildToolsVersion = 21.1.1 diff --git a/config/Ice.props b/config/Ice.props index e4e44b70ca3..8f667116580 100644 --- a/config/Ice.props +++ b/config/Ice.props @@ -2,8 +2,8 @@ <!-- Copyright (c) 2009-2016 ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <IceVersion>3.7.0</IceVersion> - <IceIntVersion>30700</IceIntVersion> + <IceVersion>3.7a0</IceVersion> + <IceIntVersion>30751</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> </PropertyGroup> </Project> diff --git a/config/Make.common.rules b/config/Make.common.rules index acbf6d1105e..670e2872646 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -13,11 +13,11 @@ SHELL = /bin/sh VERSION_MAJOR = 3 -VERSION_MINOR = 7 -VERSION_PATCH = 0 -VERSION = 3.7.0 +VERSION_MINOR = 7a0 +VERSION_PATCH = 51 +VERSION = 3.7a0 SHORT_VERSION = 3.7 -SOVERSION = 37 +SOVERSION = 37a0 INSTALL = cp -fp INSTALL_PROGRAM = ${INSTALL} diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index 98a9c70f552..0cc4403caaf 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -12,11 +12,11 @@ # ---------------------------------------------------------------------- SHELL = /bin/sh -VERSION = 3.7.0 -INTVERSION = 3.7.0 +VERSION = 3.7a0 +INTVERSION = 3.7.51 SHORT_VERSION = 3.7 -PATCH_VERSION = 0 -SOVERSION = 37 +PATCH_VERSION = 51 +SOVERSION = 37a0 OBJEXT = .obj diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index 692bf79e59b..96aa85fa70f 100644 --- a/cpp/config/templates.xml +++ b/cpp/config/templates.xml @@ -59,7 +59,7 @@ <parameter name="publish-endpoints" default="default"/> <parameter name="flush-timeout" default="1000"/> - <service name="${instance-name}" entry="IceStormService,37:createIceStorm"> + <service name="${instance-name}" entry="IceStormService,37a0:createIceStorm"> <adapter name="${service}.TopicManager" id="${instance-name}.TopicManager" @@ -108,7 +108,7 @@ <parameter name="publish-replica-group"/> <parameter name="topic-manager-replica-group"/> - <service name="${instance-name}${node-id}" entry="IceStormService,37:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,37a0:createIceStorm"> <adapter name="${service}.TopicManager" id="${instance-name}${node-id}.TopicManager" diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 1f452588ac4..8bd3b027224 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -274,8 +274,8 @@ typedef long long Int64; // // The Ice version. // -#define ICE_STRING_VERSION "3.7.0" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30700 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "3.7a0" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30751 // AABBCC, with AA=major, BB=minor, CC=patch // // Macros to facilitate C++98 -> C++11 transition diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc index 5f7367e6fa5..6028846cb8b 100644 --- a/cpp/src/Glacier2/Glacier2Router.rc +++ b/cpp/src/Glacier2/Glacier2Router.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Glacier2 Router\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc index 5d06e645236..5482421b8d3 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc +++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Glacier2CryptPermissionsVerifier C++ Plug-in\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc index 90031a1ae81..dee5fb84b90 100644 --- a/cpp/src/Glacier2Lib/Glacier2.rc +++ b/cpp/src/Glacier2Lib/Glacier2.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "glacier237d\0" - #define ORIGINALFILENAME "glacier237d.dll\0" + #define INTERNALNAME "glacier237a0d\0" + #define ORIGINALFILENAME "glacier237a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "glacier237\0" - #define ORIGINALFILENAME "glacier237.dll\0" + #define INTERNALNAME "glacier237a0\0" + #define ORIGINALFILENAME "glacier237a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Glacier2 C++ Client Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc index 447b17bb6e1..73317b5b630 100644 --- a/cpp/src/Ice/Ice.rc +++ b/cpp/src/Ice/Ice.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "ice37d\0" - #define ORIGINALFILENAME "ice37d.dll\0" + #define INTERNALNAME "ice37a0d\0" + #define ORIGINALFILENAME "ice37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "ice37\0" - #define ORIGINALFILENAME "ice37.dll\0" + #define INTERNALNAME "ice37a0\0" + #define ORIGINALFILENAME "ice37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice C++ Core Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc index 3aae6b225a5..517623671d2 100644 --- a/cpp/src/IceBox/IceBox.rc +++ b/cpp/src/IceBox/IceBox.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icebox37d\0" - #define ORIGINALFILENAME "icebox37d.dll\0" + #define INTERNALNAME "icebox37a0d\0" + #define ORIGINALFILENAME "icebox37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icebox37\0" - #define ORIGINALFILENAME "icebox37.dll\0" + #define INTERNALNAME "icebox37a0\0" + #define ORIGINALFILENAME "icebox37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceBox C++ Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc index df4e2e35848..57ecfb60ea0 100644 --- a/cpp/src/IceBox/IceBoxAdmin.rc +++ b/cpp/src/IceBox/IceBoxAdmin.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceBox Admin\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc index a9ccdf7605f..bc17dcea8ae 100644 --- a/cpp/src/IceBox/IceBoxExe.rc +++ b/cpp/src/IceBox/IceBoxExe.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceBox C++ Server\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceDB/IceDB.rc b/cpp/src/IceDB/IceDB.rc index 3246aa519a7..6b7edddcdbe 100644 --- a/cpp/src/IceDB/IceDB.rc +++ b/cpp/src/IceDB/IceDB.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icedb37d\0" - #define ORIGINALFILENAME "icedb37d.dll\0" + #define INTERNALNAME "icedb37a0d\0" + #define ORIGINALFILENAME "icedb37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icedb37\0" - #define ORIGINALFILENAME "icedb37.dll\0" + #define INTERNALNAME "icedb37a0\0" + #define ORIGINALFILENAME "icedb37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceDB C++ Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceDiscovery/IceDiscovery.rc b/cpp/src/IceDiscovery/IceDiscovery.rc index fee10463b98..09b9200388c 100755 --- a/cpp/src/IceDiscovery/IceDiscovery.rc +++ b/cpp/src/IceDiscovery/IceDiscovery.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icediscovery37d\0" - #define ORIGINALFILENAME "icediscovery37d.dll\0" + #define INTERNALNAME "icediscovery37a0d\0" + #define ORIGINALFILENAME "icediscovery37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icediscovery37\0" - #define ORIGINALFILENAME "icediscovery37.dll\0" + #define INTERNALNAME "icediscovery37a0\0" + #define ORIGINALFILENAME "icediscovery37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceDiscovery C++ Plug-in\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc index 7396803219a..cc3d26ff397 100644 --- a/cpp/src/IceGrid/IceGridAdmin.rc +++ b/cpp/src/IceGrid/IceGridAdmin.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid Admin\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridDB.rc b/cpp/src/IceGrid/IceGridDB.rc index ee35502644c..43ac678be1e 100644 --- a/cpp/src/IceGrid/IceGridDB.rc +++ b/cpp/src/IceGrid/IceGridDB.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGridDB\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc index 4e7e2e7bc06..e0fba932ca1 100644 --- a/cpp/src/IceGrid/IceGridNode.rc +++ b/cpp/src/IceGrid/IceGridNode.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid Node\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc index 517fa659bdf..f52fd022a8d 100644 --- a/cpp/src/IceGrid/IceGridRegistry.rc +++ b/cpp/src/IceGrid/IceGridRegistry.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid Registry\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc index 52b9c9c38dd..f120cbb2065 100644 --- a/cpp/src/IceGridLib/IceGrid.rc +++ b/cpp/src/IceGridLib/IceGrid.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icegrid37d\0" - #define ORIGINALFILENAME "icegrid37d.dll\0" + #define INTERNALNAME "icegrid37a0d\0" + #define ORIGINALFILENAME "icegrid37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icegrid37\0" - #define ORIGINALFILENAME "icegrid37.dll\0" + #define INTERNALNAME "icegrid37a0\0" + #define ORIGINALFILENAME "icegrid37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid C++ Client Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc index 27b213fc3e3..0b28e9ea8c1 100755 --- a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc +++ b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icelocatordiscovery37d\0" - #define ORIGINALFILENAME "icelocatordiscovery37d.dll\0" + #define INTERNALNAME "icelocatordiscovery37a0d\0" + #define ORIGINALFILENAME "icelocatordiscovery37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icelocatordiscovery37\0" - #define ORIGINALFILENAME "icelocatordiscovery37.dll\0" + #define INTERNALNAME "icelocatordiscovery37a0\0" + #define ORIGINALFILENAME "icelocatordiscovery37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceLocatorDiscovery C++ Plug-in\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc index 4063932e34a..d7ed8099c93 100644 --- a/cpp/src/IcePatch2/IcePatch2Calc.rc +++ b/cpp/src/IcePatch2/IcePatch2Calc.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 Calc\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc index 0800e07d0c3..676c016b0a1 100644 --- a/cpp/src/IcePatch2/IcePatch2Client.rc +++ b/cpp/src/IcePatch2/IcePatch2Client.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 Client\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc index 8ca8e7b5509..91de9683889 100644 --- a/cpp/src/IcePatch2/IcePatch2Server.rc +++ b/cpp/src/IcePatch2/IcePatch2Server.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 Server\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc index 8a7c2f77df8..3506209b741 100644 --- a/cpp/src/IcePatch2Lib/IcePatch2.rc +++ b/cpp/src/IcePatch2Lib/IcePatch2.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icepatch237d\0" - #define ORIGINALFILENAME "icepatch237d.dll\0" + #define INTERNALNAME "icepatch237a0d\0" + #define ORIGINALFILENAME "icepatch237a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icepatch237\0" - #define ORIGINALFILENAME "icepatch237.dll\0" + #define INTERNALNAME "icepatch237a0\0" + #define ORIGINALFILENAME "icepatch237a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 Client Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc index 9b56874f6d7..f5dec23a0ac 100644 --- a/cpp/src/IceSSL/IceSSL.rc +++ b/cpp/src/IceSSL/IceSSL.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icessl37d\0" - #define ORIGINALFILENAME "icessl37d.dll\0" + #define INTERNALNAME "icessl37a0d\0" + #define ORIGINALFILENAME "icessl37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icessl37\0" - #define ORIGINALFILENAME "icessl37.dll\0" + #define INTERNALNAME "icessl37a0\0" + #define ORIGINALFILENAME "icessl37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceSSL C++ Plug-in\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc index df25fb8a9f0..0c878ec040b 100644 --- a/cpp/src/IceStorm/IceStormAdmin.rc +++ b/cpp/src/IceStorm/IceStormAdmin.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm Admin\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc index 06af7aec77b..be057923241 100644 --- a/cpp/src/IceStorm/IceStormDB.rc +++ b/cpp/src/IceStorm/IceStormDB.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStormDB\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc index 6b8ec38ac59..4ca9ae99135 100644 --- a/cpp/src/IceStorm/IceStormService.rc +++ b/cpp/src/IceStorm/IceStormService.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestormservice37d\0" - #define ORIGINALFILENAME "icestormservice37d.dll\0" + #define INTERNALNAME "icestormservice37a0d\0" + #define ORIGINALFILENAME "icestormservice37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestormservice37\0" - #define ORIGINALFILENAME "icestormservice37.dll\0" + #define INTERNALNAME "icestormservice37a0\0" + #define ORIGINALFILENAME "icestormservice37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm C++ Service for IceBox\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc index 1541de9d296..1696c000f2a 100644 --- a/cpp/src/IceStormLib/IceStorm.rc +++ b/cpp/src/IceStormLib/IceStorm.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestorm37d\0" - #define ORIGINALFILENAME "icestorm37d.dll\0" + #define INTERNALNAME "icestorm37a0d\0" + #define ORIGINALFILENAME "icestorm37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestorm37\0" - #define ORIGINALFILENAME "icestorm37.dll\0" + #define INTERNALNAME "icestorm37a0\0" + #define ORIGINALFILENAME "icestorm37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm C++ Client Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc index f9036a32376..ec47aa3c60e 100644 --- a/cpp/src/IceUtil/IceUtil.rc +++ b/cpp/src/IceUtil/IceUtil.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "iceutil37d\0" - #define ORIGINALFILENAME "iceutil37d.dll\0" + #define INTERNALNAME "iceutil37a0d\0" + #define ORIGINALFILENAME "iceutil37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "iceutil37\0" - #define ORIGINALFILENAME "iceutil37.dll\0" + #define INTERNALNAME "iceutil37a0\0" + #define ORIGINALFILENAME "iceutil37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice C++ Utility Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc index 0dc60672986..506c799cdd4 100644 --- a/cpp/src/IceXML/IceXML.rc +++ b/cpp/src/IceXML/IceXML.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icexml37d\0" - #define ORIGINALFILENAME "icexml37d.dll\0" + #define INTERNALNAME "icexml37a0d\0" + #define ORIGINALFILENAME "icexml37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icexml37\0" - #define ORIGINALFILENAME "icexml37.dll\0" + #define INTERNALNAME "icexml37a0\0" + #define ORIGINALFILENAME "icexml37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceXML C++ Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc index 77ec2f8d8d0..0f90d5b8279 100644 --- a/cpp/src/Slice/Slice.rc +++ b/cpp/src/Slice/Slice.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "slice37d\0" - #define ORIGINALFILENAME "slice37d.dll\0" + #define INTERNALNAME "slice37a0d\0" + #define ORIGINALFILENAME "slice37a0d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "slice37\0" - #define ORIGINALFILENAME "slice37.dll\0" + #define INTERNALNAME "slice37a0\0" + #define ORIGINALFILENAME "slice37a0.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice C++ Library\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc index 4f0132a4034..8a4d8e1385a 100644 --- a/cpp/src/iceserviceinstall/IceServiceInstall.rc +++ b/cpp/src/iceserviceinstall/IceServiceInstall.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Install Ice Services as Windows Services\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc index 52ae4928c5a..3468c5e6ad1 100644 --- a/cpp/src/slice2confluence/Slice2Confluence.rc +++ b/cpp/src/slice2confluence/Slice2Confluence.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to Confluence Markup Translator\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc index d50d665c651..04c1de132b3 100644 --- a/cpp/src/slice2cpp/Slice2Cpp.rc +++ b/cpp/src/slice2cpp/Slice2Cpp.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to C++ Translator\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc index f32fc762b86..9ef261fab2e 100644 --- a/cpp/src/slice2cs/Slice2Cs.rc +++ b/cpp/src/slice2cs/Slice2Cs.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to C# Translator\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc index ce5ed297cbc..3fd63109d66 100644 --- a/cpp/src/slice2html/Slice2Html.rc +++ b/cpp/src/slice2html/Slice2Html.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to HTML Translator\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc index b89619c08ee..e462c675efd 100644 --- a/cpp/src/slice2java/Slice2Java.rc +++ b/cpp/src/slice2java/Slice2Java.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to Java Translator\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2js/Slice2Js.rc b/cpp/src/slice2js/Slice2Js.rc index f9642c7e897..d5be4e23ecd 100644 --- a/cpp/src/slice2js/Slice2Js.rc +++ b/cpp/src/slice2js/Slice2Js.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to JavaScript Translator\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc index 18992dd5663..3af48837355 100644 --- a/cpp/src/slice2php/Slice2PHP.rc +++ b/cpp/src/slice2php/Slice2PHP.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to PHP Translator\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc index 86522b481a4..95d3e771712 100644 --- a/cpp/src/slice2py/Slice2Py.rc +++ b/cpp/src/slice2py/Slice2Py.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice To Python Translator\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\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.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX index 3a434fbc635..334072652ae 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX @@ -1,4 +1,4 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7.0.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7a0.dylib 1 (anonymous namespace)::Thrower::fifth() in client 2 (anonymous namespace)::Thrower::forth() in client 3 (anonymous namespace)::Thrower::third() in client diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX index 9bf3928a30b..5eeb56428ab 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX @@ -1,6 +1,6 @@ - 0 IceUtil::Exception::Exception(char const*, int) in libIceUtil.3.7.0.dylib - 1 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7.0.dylib - 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7.0.dylib + 0 IceUtil::Exception::Exception(char const*, int) in libIceUtil.3.7a0.dylib + 1 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7a0.dylib + 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7a0.dylib 3 (anonymous namespace)::Thrower::fifth() in client 4 (anonymous namespace)::Thrower::forth() in client 5 (anonymous namespace)::Thrower::third() in client diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX index 49cbd3e5fa8..4782f2d15e9 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX @@ -1,3 +1,3 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7.0.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7a0.dylib 1 main() in client 2 start() in libdyld.dylib
\ No newline at end of file diff --git a/csharp/BuildInstructions.md b/csharp/BuildInstructions.md index 2512b854dce..354828a7c84 100644 --- a/csharp/BuildInstructions.md +++ b/csharp/BuildInstructions.md @@ -25,7 +25,7 @@ The build system requires the Slice translator from Ice for C++. If you have not built Ice for C++ in this source distribution, you must set the `ICE_HOME` environment variable with the path name of your Ice installation: - > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7.0 + > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7a0 ### Building Ice for .NET @@ -49,7 +49,7 @@ C++ distribution. If you have not built Ice for C++ in this source distribution then you must set the `ICE_HOME` environment variable with the path name of your Ice installation: - > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7.0 + > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7a0 Python is required to run the test suite. Additionally, the Glacier2 tests require the Python module `passlib`, which you can install with the command: diff --git a/csharp/lib/pkgconfig/Glacier2.pc b/csharp/lib/pkgconfig/Glacier2.pc index 7a591470328..65c39e7f30e 100644 --- a/csharp/lib/pkgconfig/Glacier2.pc +++ b/csharp/lib/pkgconfig/Glacier2.pc @@ -1,4 +1,4 @@ -version = 3.7.0 +version = 3.7.51 mono_root = /usr name = Glacier2 diff --git a/csharp/lib/pkgconfig/Ice.pc b/csharp/lib/pkgconfig/Ice.pc index ff2a545b6ab..8c7f3584fef 100644 --- a/csharp/lib/pkgconfig/Ice.pc +++ b/csharp/lib/pkgconfig/Ice.pc @@ -1,4 +1,4 @@ -version = 3.7.0 +version = 3.7.51 mono_root = /usr name = Ice diff --git a/csharp/lib/pkgconfig/IceBox.pc b/csharp/lib/pkgconfig/IceBox.pc index 6b7ad6e533e..e2a5c562f5d 100644 --- a/csharp/lib/pkgconfig/IceBox.pc +++ b/csharp/lib/pkgconfig/IceBox.pc @@ -1,4 +1,4 @@ -version = 3.7.0 +version = 3.7.51 mono_root = /usr name = IceBox diff --git a/csharp/lib/pkgconfig/IceGrid.pc b/csharp/lib/pkgconfig/IceGrid.pc index 41538e6142a..0ec3a3404bb 100644 --- a/csharp/lib/pkgconfig/IceGrid.pc +++ b/csharp/lib/pkgconfig/IceGrid.pc @@ -1,4 +1,4 @@ -version = 3.7.0 +version = 3.7.51 mono_root = /usr name = IceGrid diff --git a/csharp/lib/pkgconfig/IcePatch2.pc b/csharp/lib/pkgconfig/IcePatch2.pc index 8ee0817720c..9621ac3a353 100644 --- a/csharp/lib/pkgconfig/IcePatch2.pc +++ b/csharp/lib/pkgconfig/IcePatch2.pc @@ -1,4 +1,4 @@ -version = 3.7.0 +version = 3.7.51 mono_root = /usr name = IcePatch2 diff --git a/csharp/lib/pkgconfig/IceStorm.pc b/csharp/lib/pkgconfig/IceStorm.pc index a3b2baeb454..889b683222a 100644 --- a/csharp/lib/pkgconfig/IceStorm.pc +++ b/csharp/lib/pkgconfig/IceStorm.pc @@ -1,4 +1,4 @@ -version = 3.7.0 +version = 3.7.51 mono_root = /usr name = IceStorm diff --git a/csharp/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs index 752fb0b9ed1..e5f738f9c7c 100644 --- a/csharp/src/Glacier2/AssemblyInfo.cs +++ b/csharp/src/Glacier2/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs index 3b2337c639b..fd3da61733b 100644 --- a/csharp/src/Ice/AssemblyInfo.cs +++ b/csharp/src/Ice/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs index 0cae06cbb2d..2221b360565 100644 --- a/csharp/src/Ice/Util.cs +++ b/csharp/src/Ice/Util.cs @@ -487,7 +487,7 @@ namespace Ice /// <returns>The Ice version.</returns> public static string stringVersion() { - return "3.7.0"; // "A.B.C", with A=major, B=minor, C=patch + return "3.7a0"; // "A.B.C", with A=major, B=minor, C=patch } /// <summary> @@ -498,7 +498,7 @@ namespace Ice /// <returns>The Ice version.</returns> public static int intVersion() { - return 30700; // AABBCC, with AA=major, BB=minor, CC=patch + return 30751; // AABBCC, with AA=major, BB=minor, CC=patch } /// <summary> diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs index c6d473cbcfa..4172eca22c0 100644 --- a/csharp/src/IceBox/AssemblyInfo.cs +++ b/csharp/src/IceBox/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs index 5b5f0dfe0e7..4bddf9f795e 100644 --- a/csharp/src/IceBox/AssemblyInfoExe.cs +++ b/csharp/src/IceBox/AssemblyInfoExe.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak index 59fd20b307d..dc5e336b600 100644 --- a/csharp/src/IceBox/Makefile.mak +++ b/csharp/src/IceBox/Makefile.mak @@ -74,11 +74,11 @@ iceboxnetconfig: <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="Ice" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="3.7.0.0" href="..\Assemblies\Ice.dll"/> + <codeBase version="3.7.51.0" href="..\Assemblies\Ice.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="3.7.0.0" href="..\Assemblies\IceBox.dll"/> + <codeBase version="3.7.51.0" href="..\Assemblies\IceBox.dll"/> </dependentAssembly> <!-- This allows iceboxnet to load the IceSSL plug-in using a strong name. We omit the @@ -87,7 +87,7 @@ iceboxnetconfig: --> <dependentAssembly> <assemblyIdentity name="IceSSL"/> - <codeBase version="3.7.0.0" href="..\Assemblies\IceSSL.dll"/> + <codeBase version="3.7.51.0" href="..\Assemblies\IceSSL.dll"/> </dependentAssembly> </assemblyBinding> </runtime> diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs index 8fff410f384..e3589ff0992 100644 --- a/csharp/src/IceDiscovery/AssemblyInfo.cs +++ b/csharp/src/IceDiscovery/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs index b5c667fde32..1586f02db25 100644 --- a/csharp/src/IceGrid/AssemblyInfo.cs +++ b/csharp/src/IceGrid/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs index 36b8af0aec9..c894ed23c71 100644 --- a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs +++ b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs index 61e0857226c..ea082abeb37 100644 --- a/csharp/src/IcePatch2/AssemblyInfo.cs +++ b/csharp/src/IcePatch2/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs index 0e84381afc2..03fce5bf546 100644 --- a/csharp/src/IceSSL/AssemblyInfo.cs +++ b/csharp/src/IceSSL/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs index c757020ddd2..dfc6ca3f663 100644 --- a/csharp/src/IceStorm/AssemblyInfo.cs +++ b/csharp/src/IceStorm/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/test/TestCommon/Properties/AssemblyInfo.cs b/csharp/test/TestCommon/Properties/AssemblyInfo.cs index 8cf5c5bfe0e..63c3ef6b010 100644 --- a/csharp/test/TestCommon/Properties/AssemblyInfo.cs +++ b/csharp/test/TestCommon/Properties/AssemblyInfo.cs @@ -39,7 +39,7 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.7.0")] -[assembly: AssemblyFileVersion("3.7.0")] +[assembly: AssemblyVersion("3.7.51")] +[assembly: AssemblyFileVersion("3.7.51")] [assembly: System.CLSCompliant(true)] diff --git a/java/BuildInstructions.md b/java/BuildInstructions.md index 8225ed1d235..5d36af801a2 100644 --- a/java/BuildInstructions.md +++ b/java/BuildInstructions.md @@ -106,12 +106,12 @@ not built Ice for C++ in this source distribution, you must set the `ICE_HOME` environment variable with the path name of your Ice installation. For example, on Unix: - $ export ICE_HOME=/opt/Ice-3.7.0 (For local build) + $ export ICE_HOME=/opt/Ice-3.7a0 (For local build) $ export ICE_HOME=/usr (For RPM installation) On Windows: - > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7.0 + > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7a0 You will also need to set `CPP_PLATFORM` and `CPP_CONFIGURATION` to much your C++ build configuration in order for gradle o locate the slice2java compiler @@ -152,7 +152,7 @@ To install Ice for Java in the directory specified by the `prefix` variable in The installation installs the following JAR files to `<prefix>/lib`. glacier2-3.7.0.jar - ice-3.7.0.jar + ice-3.7a0.jar icebox-3.7.0.jar icediscovery-3.7.0.jar icegrid-3.7.0.jar @@ -171,12 +171,12 @@ C++ distribution. If you have not built Ice for C++ in this source distribution then you must set the `ICE_HOME` environment variable with the path name of your Ice installation. On Unix: - $ export ICE_HOME=/opt/Ice-3.7.0 (For local build) + $ export ICE_HOME=/opt/Ice-3.7a0 (For local build) $ export ICE_HOME=/usr (For RPM installation) On Windows: - > set ICE_HOME=c:\Program Files (x86)\ZeroC\Ice-3.7.0 + > set ICE_HOME=c:\Program Files (x86)\ZeroC\Ice-3.7a0 Python is required to run the test suite. To run the tests, open a command window and change to the top-level directory. At the command prompt, execute: diff --git a/java/gradle.properties b/java/gradle.properties index 1db0a8d4a51..9e66d73eea6 100644 --- a/java/gradle.properties +++ b/java/gradle.properties @@ -7,7 +7,7 @@ // // ********************************************************************** -iceVersion = 3.7.0 +iceVersion = 3.7.0-alpha0 // // Select an installation base directory. The directory will be created diff --git a/java/src/Ice/src/main/java/Ice/Util.java b/java/src/Ice/src/main/java/Ice/Util.java index 2cfe0a0225f..7161ad93a1e 100644 --- a/java/src/Ice/src/main/java/Ice/Util.java +++ b/java/src/Ice/src/main/java/Ice/Util.java @@ -485,7 +485,7 @@ public final class Util public static String stringVersion() { - return "3.7.0"; // "A.B.C", with A=major, B=minor, C=patch + return "3.7a0"; // "A.B.C", with A=major, B=minor, C=patch } /** @@ -498,7 +498,7 @@ public final class Util public static int intVersion() { - return 30700; // AABBCC, with AA=major, BB=minor, CC=patch + return 30751; // AABBCC, with AA=major, BB=minor, CC=patch } /** diff --git a/js/BuildInstructions.md b/js/BuildInstructions.md index 1f950a73be9..8d06b9550e1 100644 --- a/js/BuildInstructions.md +++ b/js/BuildInstructions.md @@ -136,9 +136,9 @@ following command: > npm pack -This will generate the file `ice-3.7.0.tgz`, which can be installed by running: +This will generate the file `ice-3.7a0.tgz`, which can be installed by running: - > npm install <path_to_file>/ice-3.7.0.tgz + > npm install <path_to_file>/ice-3.7a0.tgz To use Ice for JavaScript with a browser, copy the appropriate JavaScript library files located in the `lib` directory to your web server. diff --git a/js/package.json b/js/package.json index b83ac053b3f..b67b18605d6 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "ice", - "version": "3.7.0", + "version": "3.7.0-alpha0", "description": "Ice for JavaScript runtime", "author": "Zeroc, Inc.", "homepage": "https://zeroc.com", diff --git a/php/src/php5/IcePHP.rc b/php/src/php5/IcePHP.rc index c46127e6330..bd27ae7cd0d 100644 --- a/php/src/php5/IcePHP.rc +++ b/php/src/php5/IcePHP.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice for PHP Extension\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/php/src/php7/IcePHP.rc b/php/src/php7/IcePHP.rc index c46127e6330..bd27ae7cd0d 100644 --- a/php/src/php7/IcePHP.rc +++ b/php/src/php7/IcePHP.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice for PHP Extension\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/python/modules/IcePy/IcePy.rc b/python/modules/IcePy/IcePy.rc index 5c761d812dc..238a32b0b16 100644 --- a/python/modules/IcePy/IcePy.rc +++ b/python/modules/IcePy/IcePy.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,0,0 - PRODUCTVERSION 3,7,0,0 + FILEVERSION 3,7,51,0 + PRODUCTVERSION 3,7,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice for Python Extension\0" - VALUE "FileVersion", "3.7.0\0" + VALUE "FileVersion", "3.7a0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7.0\0" + VALUE "ProductVersion", "3.7a0\0" END END BLOCK "VarFileInfo" diff --git a/ruby/BuildInstructionsWindows.md b/ruby/BuildInstructionsWindows.md index a5559a545ab..9f7b214420e 100644 --- a/ruby/BuildInstructionsWindows.md +++ b/ruby/BuildInstructionsWindows.md @@ -28,7 +28,7 @@ The instructions in this file make the following assumptions about your build environment: 1. You have installed the Ice 3.7.0 distribution using the ZeroC installer. The -default installation directory is `C:\Program Files (x86)\ZeroC\Ice-3.7.0`. +default installation directory is `C:\Program Files (x86)\ZeroC\Ice-3.7a0`. 2. You have installed Ruby 2.2.4 using the Windows installer. The default installation directory is `C:\Ruby224`. 3. You have installed the Ruby Development Kit 4.7.2 in `C:\RubyDevKit-4.7.2`. @@ -70,7 +70,7 @@ forward slashes (/) as directory separators, and cannot contain any space. If your Ice installation's path contains any space, use the DOS 8-character name as a work-around, for example: - > set ICE_HOME=C:/PROGRA~2/Ice-3.7.0 + > set ICE_HOME=C:/PROGRA~2/Ice-3.7a0 You can use `dir /x` to get this DOS name, for example: @@ -105,20 +105,20 @@ The Ruby interpreter must be able to locate the Ice extension. One way to configure the interpreter is to define the `RUBYLIB` environment variable as follows: - > set RUBYLIB=C:\Ice-3.7.0\ruby + > set RUBYLIB=C:\Ice-3.7a0\ruby -This example assumes your Ice for Ruby installation is located in the `C:\Ice-3.7.0` +This example assumes your Ice for Ruby installation is located in the `C:\Ice-3.7a0` directory. In addition, you must modify your PATH environment variable to include the following directories: - C:\Program Files (x86)\ZeroC\Ice-3.7.0\bin - C:\Ice-3.7.0\bin + C:\Program Files (x86)\ZeroC\Ice-3.7a0\bin + C:\Ice-3.7a0\bin At a command prompt, you can set your PATH as shown below: - > set PATH=C:\Program Files (x86)\ZeroC\Ice-3.7.0\bin;C:\Ice-3.7.0\bin;%PATH% + > set PATH=C:\Program Files (x86)\ZeroC\Ice-3.7a0\bin;C:\Ice-3.7a0\bin;%PATH% ## Running the Ruby Tests |