diff options
Diffstat (limited to 'cpp')
59 files changed, 271 insertions, 271 deletions
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index c968bc72ac3..6cfed6c142f 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,35:createIceStorm"> + <service name="${instance-name}" entry="IceStormService,36:createIceStorm"> <dbenv name="${service}"/> @@ -111,7 +111,7 @@ <parameter name="publish-replica-group"/> <parameter name="topic-manager-replica-group"/> - <service name="${instance-name}${node-id}" entry="IceStormService,35:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,36:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/Ice/MFC/client/HelloClient.rc b/cpp/demo/Ice/MFC/client/HelloClient.rc index a10b0022887..5a349283a8e 100755 --- a/cpp/demo/Ice/MFC/client/HelloClient.rc +++ b/cpp/demo/Ice/MFC/client/HelloClient.rc @@ -101,8 +101,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -119,12 +119,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc." VALUE "FileDescription", "Ice Hello Client" - VALUE "FileVersion", "3.5.1" + VALUE "FileVersion", "3.6.51" VALUE "InternalName", "HelloClient.exe" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved." VALUE "OriginalFilename", "HelloClient.exe" VALUE "ProductName", "Ice" - VALUE "ProductVersion", "3.5.1" + VALUE "ProductVersion", "3.6.51" END END BLOCK "VarFileInfo" diff --git a/cpp/demo/Ice/MFC/server/HelloServer.rc b/cpp/demo/Ice/MFC/server/HelloServer.rc index c186f7bfd37..31e11e30f19 100644 --- a/cpp/demo/Ice/MFC/server/HelloServer.rc +++ b/cpp/demo/Ice/MFC/server/HelloServer.rc @@ -92,8 +92,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -110,12 +110,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Hello Server\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "HelloServer.exe\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "HelloServer.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj index 8c731296dc1..151bde893ca 100644 --- a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj @@ -74,10 +74,10 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(PlatformName)\$(ProjectName)\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">helloplugin35d</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">helloplugin35d</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">helloplugin35</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">helloplugin35</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">helloplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">helloplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">helloplugin36</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">helloplugin36</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> @@ -103,13 +103,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin35d.dll</OutputFile> + <OutputFile>helloplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin35d.lib</ImportLibrary> + <ImportLibrary>helloplugin36d.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -141,13 +141,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin35d.dll</OutputFile> + <OutputFile>helloplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin35d.lib</ImportLibrary> + <ImportLibrary>helloplugin36d.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -175,12 +175,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin35.dll</OutputFile> + <OutputFile>helloplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin35.lib</ImportLibrary> + <ImportLibrary>helloplugin36.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -212,12 +212,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin35.dll</OutputFile> + <OutputFile>helloplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin35.lib</ImportLibrary> + <ImportLibrary>helloplugin36.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj index 2bb1aa6bbf3..a1cb75cf007 100644 --- a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj @@ -74,10 +74,10 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(PlatformName)\$(ProjectName)\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">loggerplugin35d</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">loggerplugin35d</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">loggerplugin35</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">loggerplugin35</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">loggerplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">loggerplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">loggerplugin36</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">loggerplugin36</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> @@ -103,13 +103,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin35d.dll</OutputFile> + <OutputFile>loggerplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin35d.lib</ImportLibrary> + <ImportLibrary>loggerplugin36d.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -141,13 +141,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin35d.dll</OutputFile> + <OutputFile>loggerplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin35d.lib</ImportLibrary> + <ImportLibrary>loggerplugin36d.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -175,12 +175,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin35.dll</OutputFile> + <OutputFile>loggerplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin35.lib</ImportLibrary> + <ImportLibrary>loggerplugin36.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -212,12 +212,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin35.dll</OutputFile> + <OutputFile>loggerplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin35.lib</ImportLibrary> + <ImportLibrary>loggerplugin36.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/cpp/demo/IcePatch2/MFC/PatchClient.rc b/cpp/demo/IcePatch2/MFC/PatchClient.rc index 71f541c4434..4c4b6f2c817 100644 --- a/cpp/demo/IcePatch2/MFC/PatchClient.rc +++ b/cpp/demo/IcePatch2/MFC/PatchClient.rc @@ -118,8 +118,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -136,12 +136,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Patch Client\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "PatchClient.exe\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "PatchClient.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox index 22733024a7b..ab01ab72dcd 100644 --- a/cpp/demo/IceStorm/clock/config.icebox +++ b/cpp/demo/IceStorm/clock/config.icebox @@ -11,7 +11,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # The IceStorm service. The service is configured using a separate # configuration file (see config.service). # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox index b02967a9479..1314160556f 100644 --- a/cpp/demo/IceStorm/counter/config.icebox +++ b/cpp/demo/IceStorm/counter/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/counter/expect.py b/cpp/demo/IceStorm/counter/expect.py index ed1f950fa3b..607b3681f76 100755 --- a/cpp/demo/IceStorm/counter/expect.py +++ b/cpp/demo/IceStorm/counter/expect.py @@ -27,7 +27,7 @@ Util.cleanDbDir("db") print("ok") if Util.defaultHost: - args = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.service %s"' \ + args = ' --IceBox.Service.IceStorm="IceStormService,36:createIceStorm --Ice.Config=config.service %s"' \ % Util.defaultHost else: args = '' diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml index 1c2be893345..da19d591e81 100644 --- a/cpp/demo/IceStorm/replicated/application.xml +++ b/cpp/demo/IceStorm/replicated/application.xml @@ -32,7 +32,7 @@ <properties refid="mx"/> </properties> - <service name="IceStorm" entry="IceStormService,35:createIceStorm"> + <service name="IceStorm" entry="IceStormService,36:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/IceStorm/replicated2/config.ib1 b/cpp/demo/IceStorm/replicated2/config.ib1 index f8c239d5009..70da02fcde9 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib1 +++ b/cpp/demo/IceStorm/replicated2/config.ib1 @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9990 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.s1 +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.s1 # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated2/config.ib2 b/cpp/demo/IceStorm/replicated2/config.ib2 index 74f4d9c0eca..bbad33cd40b 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib2 +++ b/cpp/demo/IceStorm/replicated2/config.ib2 @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9991 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.s2 +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.s2 # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated2/config.ib3 b/cpp/demo/IceStorm/replicated2/config.ib3 index 5925f8f0634..20a57a2122f 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib3 +++ b/cpp/demo/IceStorm/replicated2/config.ib3 @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9993 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.s3 +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.s3 # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated2/expect.py b/cpp/demo/IceStorm/replicated2/expect.py index d6b40b22e05..9b0e11277b4 100755 --- a/cpp/demo/IceStorm/replicated2/expect.py +++ b/cpp/demo/IceStorm/replicated2/expect.py @@ -30,11 +30,11 @@ Util.cleanDbDir("db3") print("ok") if Util.defaultHost: - a1 = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.s1 %s"' \ + a1 = ' --IceBox.Service.IceStorm="IceStormService,36:createIceStorm --Ice.Config=config.s1 %s"' \ % Util.defaultHost - a2 = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.s2 %s"' \ + a2 = ' --IceBox.Service.IceStorm="IceStormService,36:createIceStorm --Ice.Config=config.s2 %s"' \ % Util.defaultHost - a3 = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.s3 %s"' \ + a3 = ' --IceBox.Service.IceStorm="IceStormService,36:createIceStorm --Ice.Config=config.s3 %s"' \ % Util.defaultHost else: a1 = '' diff --git a/cpp/doc/swish/swish.conf b/cpp/doc/swish/swish.conf index 03b749e70b3..57d90010f5f 100644 --- a/cpp/doc/swish/swish.conf +++ b/cpp/doc/swish/swish.conf @@ -1,6 +1,6 @@ Replacerules remove /var/www/html/ -IndexDir /var/www/html/doc/Ice-3.5.1/reference -IndexDir /var/www/html/doc/Ice-3.5.1/manual +IndexDir /var/www/html/doc/Ice-3.6.51/reference +IndexDir /var/www/html/doc/Ice-3.6.51/manual IndexOnly .html FileRules filename is _sindex\.html DefaultContents HTML* diff --git a/cpp/doc/swish/swishcgi.conf b/cpp/doc/swish/swishcgi.conf index be6a080aed6..51a06701b14 100644 --- a/cpp/doc/swish/swishcgi.conf +++ b/cpp/doc/swish/swishcgi.conf @@ -1,6 +1,6 @@ use lib '/var/www/html/doc/swishdir'; -my $ice_version = '3.5.1'; +my $ice_version = '3.6.51'; my $suffix = '-IceTouch'; my $referer = $ENV{HTTP_REFERER} ? $ENV{HTTP_REFERER} : ''; diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 4e1acb3dd01..d830f49f81c 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -222,7 +222,7 @@ typedef long long Int64; // // The Ice version. // -#define ICE_STRING_VERSION "3.5.1" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30501 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "3.6b" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30651 // AABBCC, with AA=major, BB=minor, CC=patch #endif diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc index 5a59b250653..d166e058d8d 100644 --- a/cpp/src/Freeze/Freeze.rc +++ b/cpp/src/Freeze/Freeze.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "freeze35d\0" - #define ORIGINALFILENAME "freeze35d.dll\0" + #define INTERNALNAME "freeze36d\0" + #define ORIGINALFILENAME "freeze36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "freeze35\0" - #define ORIGINALFILENAME "freeze35.dll\0" + #define INTERNALNAME "freeze36\0" + #define ORIGINALFILENAME "freeze36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Freeze DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc index 122c0130fda..fbfcefd4b89 100644 --- a/cpp/src/FreezeScript/DumpDB.rc +++ b/cpp/src/FreezeScript/DumpDB.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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", "Dump Database\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "dumpdb\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "dumpdb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc index 68c7b9adbc5..ea44263688c 100644 --- a/cpp/src/FreezeScript/TransformDB.rc +++ b/cpp/src/FreezeScript/TransformDB.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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", "Transform Database\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "transformdb\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "transformdb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc index 2cccc25e48e..7fecca6846e 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "glacier2router\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "glacier2router.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc index c8a14cfac12..a7b9ab79bcc 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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 DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc index b7e13e060bb..89724b77481 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "glacier235d\0" - #define ORIGINALFILENAME "glacier235d.dll\0" + #define INTERNALNAME "glacier236d\0" + #define ORIGINALFILENAME "glacier236d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "glacier235\0" - #define ORIGINALFILENAME "glacier235.dll\0" + #define INTERNALNAME "glacier236\0" + #define ORIGINALFILENAME "glacier236.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Glacier2 DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc index 075f463932c..892d71fb326 100644 --- a/cpp/src/Ice/Ice.rc +++ b/cpp/src/Ice/Ice.rc @@ -2,17 +2,17 @@ #include "EventLoggerMsg.rc" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "ice35d\0" - #define ORIGINALFILENAME "ice35d.dll\0" + #define INTERNALNAME "ice36d\0" + #define ORIGINALFILENAME "ice36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "ice35\0" - #define ORIGINALFILENAME "ice35.dll\0" + #define INTERNALNAME "ice36\0" + #define ORIGINALFILENAME "ice36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Core DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc index 2e9916ff840..cf65b4b030e 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icebox35d\0" - #define ORIGINALFILENAME "icebox35d.dll\0" + #define INTERNALNAME "icebox36d\0" + #define ORIGINALFILENAME "icebox36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icebox35\0" - #define ORIGINALFILENAME "icebox35.dll\0" + #define INTERNALNAME "icebox36\0" + #define ORIGINALFILENAME "icebox36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceBox DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc index 8d7df0856a7..b81931378f8 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "iceboxadmin\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "iceboxadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc index c05fb3feb79..f937ffb4244 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceDiscovery/IceDiscovery.rc b/cpp/src/IceDiscovery/IceDiscovery.rc index 5257c6e6dad..6e9631a078f 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icediscovery35d\0" - #define ORIGINALFILENAME "icediscovery35d.dll\0" + #define INTERNALNAME "icediscovery36d\0" + #define ORIGINALFILENAME "icediscovery36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icediscovery35\0" - #define ORIGINALFILENAME "icediscovery35.dll\0" + #define INTERNALNAME "icediscovery36\0" + #define ORIGINALFILENAME "icediscovery36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Discovery DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc index 797ba5e3d19..b394665d3cc 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icegridadmin\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icegridadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc index c2e78d8ffe4..a0cfcc1eaa1 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icegridnode\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icegridnode.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc index a3c1bbf2b14..a9d3404e46a 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icegridregistry\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icegridregistry.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc index 0ea5333dafc..cf01132c31b 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icegrid35d\0" - #define ORIGINALFILENAME "icegrid35d.dll\0" + #define INTERNALNAME "icegrid36d\0" + #define ORIGINALFILENAME "icegrid36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icegrid35\0" - #define ORIGINALFILENAME "icegrid35.dll\0" + #define INTERNALNAME "icegrid36\0" + #define ORIGINALFILENAME "icegrid36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc index a8fe1c7c308..38ad80d9d91 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icepatch2calc\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icepatch2calc.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc index 69f3324a322..4a6a7d63615 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icepatch2client\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icepatch2client.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc index 12071f388e6..71324c01b8b 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icepatch2server\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icepatch2server.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc index d2e345a4ff5..8e4cdbbab5b 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icepatch235d\0" - #define ORIGINALFILENAME "icepatch235d.dll\0" + #define INTERNALNAME "icepatch236d\0" + #define ORIGINALFILENAME "icepatch236d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icepatch235\0" - #define ORIGINALFILENAME "icepatch235.dll\0" + #define INTERNALNAME "icepatch236\0" + #define ORIGINALFILENAME "icepatch236.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc index 25eeb881845..ac721ac15a8 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icessl35d\0" - #define ORIGINALFILENAME "icessl35d.dll\0" + #define INTERNALNAME "icessl36d\0" + #define ORIGINALFILENAME "icessl36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icessl35\0" - #define ORIGINALFILENAME "icessl35.dll\0" + #define INTERNALNAME "icessl36\0" + #define ORIGINALFILENAME "icessl36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceSSL DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc index 6e936a8b363..a761238fc42 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icestormadmin\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icestormadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc index 232549824b7..ef628a9917c 100644 --- a/cpp/src/IceStorm/IceStormDB.rc +++ b/cpp/src/IceStorm/IceStormDB.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestormdb35d\0" - #define ORIGINALFILENAME "icestormdb35d.dll\0" + #define INTERNALNAME "icestormdb36d\0" + #define ORIGINALFILENAME "icestormdb36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestormdb35\0" - #define ORIGINALFILENAME "icestormdb35.dll\0" + #define INTERNALNAME "icestormdb36\0" + #define ORIGINALFILENAME "icestormdb36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm DB DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormMigrate.rc b/cpp/src/IceStorm/IceStormMigrate.rc index 09deb80a7d1..da6d915ee40 100644 --- a/cpp/src/IceStorm/IceStormMigrate.rc +++ b/cpp/src/IceStorm/IceStormMigrate.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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 Migrate\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icestormmigrate\0" VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icestormmigrate.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc index 7c8dd744c63..8741de8cbc6 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestormservice35d\0" - #define ORIGINALFILENAME "icestormservice35d.dll\0" + #define INTERNALNAME "icestormservice36d\0" + #define ORIGINALFILENAME "icestormservice36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestormservice35\0" - #define ORIGINALFILENAME "icestormservice35.dll\0" + #define INTERNALNAME "icestormservice36\0" + #define ORIGINALFILENAME "icestormservice36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm Service DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc index 6f008531e04..f525f38c54e 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestorm35d\0" - #define ORIGINALFILENAME "icestorm35d.dll\0" + #define INTERNALNAME "icestorm36d\0" + #define ORIGINALFILENAME "icestorm36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestorm35\0" - #define ORIGINALFILENAME "icestorm35.dll\0" + #define INTERNALNAME "icestorm36\0" + #define ORIGINALFILENAME "icestorm36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc index d11904e2b9e..f79c945947b 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "iceutil35d\0" - #define ORIGINALFILENAME "iceutil35d.dll\0" + #define INTERNALNAME "iceutil36d\0" + #define ORIGINALFILENAME "iceutil36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "iceutil35\0" - #define ORIGINALFILENAME "iceutil35.dll\0" + #define INTERNALNAME "iceutil36\0" + #define ORIGINALFILENAME "iceutil36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Utilities DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc index 528b1385a40..63b51f3283d 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icexml35d\0" - #define ORIGINALFILENAME "icexml35d.dll\0" + #define INTERNALNAME "icexml36d\0" + #define ORIGINALFILENAME "icexml36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icexml35\0" - #define ORIGINALFILENAME "icexml35.dll\0" + #define INTERNALNAME "icexml36\0" + #define ORIGINALFILENAME "icexml36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceXML DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc index 897db62f504..0608f63aafd 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "slice35d\0" - #define ORIGINALFILENAME "slice35d.dll\0" + #define INTERNALNAME "slice36d\0" + #define ORIGINALFILENAME "slice36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "slice35\0" - #define ORIGINALFILENAME "slice35.dll\0" + #define INTERNALNAME "slice36\0" + #define ORIGINALFILENAME "slice36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice Utilities DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca index 0d551890688..c5202052a90 100755 --- a/cpp/src/ca/iceca +++ b/cpp/src/ca/iceca @@ -118,7 +118,7 @@ if sys.argv[script] == "import": checkLocations = [".", os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "lib")), os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "..", "lib")), - "/usr/share/Ice-3.5.1"] + "/usr/share/Ice-3.6.51"] for bindir in checkLocations: bindir = os.path.normpath(bindir) if os.path.exists(os.path.join(bindir, "ImportKey.class")): diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc index a89717b2038..3a491560937 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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", "Service Installer\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "iceserviceinstall\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "iceserviceinstall.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc index e76e2bed9b5..61441721e1a 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2confluence\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2confluence.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc index 8d712fc48a0..b8c4a81990d 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2cpp\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2cpp.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc index 5a380ae0cd4..a17225d7b07 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2cs\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2cs.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc index 495fb566fe8..21855c6583c 100644 --- a/cpp/src/slice2freeze/Slice2Freeze.rc +++ b/cpp/src/slice2freeze/Slice2Freeze.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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 Freeze Translator\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2freeze\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2freeze.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc index 5d28887a062..7651683659a 100644 --- a/cpp/src/slice2freezej/Slice2FreezeJ.rc +++ b/cpp/src/slice2freezej/Slice2FreezeJ.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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 Freeze for Java Translator\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2freezej\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2freezej.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc index b823efeaab6..9b2bd34f836 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2html\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2html.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc index b0261534424..1285929f80d 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2java\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2java.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2js/Slice2Js.rc b/cpp/src/slice2js/Slice2Js.rc index d24779820df..d0d6f893e57 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2js\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2js.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc index 7c3da5f9eab..18c4514a0df 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2py\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2py.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc index 7c3da5f9eab..18c4514a0df 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2py\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2py.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc index d510a714f46..86e158affcf 100644 --- a/cpp/src/slice2rb/Slice2Rb.rc +++ b/cpp/src/slice2rb/Slice2Rb.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,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 Ruby Translator\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2rb\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2rb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml index f69bd3136b3..cbfdeb0acaa 100644 --- a/cpp/test/IceStorm/repgrid/application.xml +++ b/cpp/test/IceStorm/repgrid/application.xml @@ -28,7 +28,7 @@ <parameter name="publish-replica-group"/> <parameter name="topic-manager-replica-group"/> - <service name="${instance-name}${node-id}" entry="IceStormService,35:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,36:createIceStorm"> <dbenv name="${service}"/> |