diff options
Diffstat (limited to 'cpp')
60 files changed, 283 insertions, 283 deletions
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index e6fb47fe8fe..d7465c422df 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,36b: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,36b: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 a2aaa52c4d2..784060d8a77 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b" + VALUE "FileVersion", "3.6.0" VALUE "InternalName", "HelloClient.exe" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved." VALUE "OriginalFilename", "HelloClient.exe" VALUE "ProductName", "Ice" - VALUE "ProductVersion", "3.6b" + VALUE "ProductVersion", "3.6.0" END END BLOCK "VarFileInfo" diff --git a/cpp/demo/Ice/MFC/server/HelloServer.rc b/cpp/demo/Ice/MFC/server/HelloServer.rc index 56ea4dc5fb1..172f3bee027 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "HelloServer.exe\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "HelloServer.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\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 d2b99385191..cf656978bde 100644 --- a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj @@ -78,10 +78,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'">helloplugin36bd</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">helloplugin36bd</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">helloplugin36b</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">helloplugin36b</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> @@ -107,13 +107,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin36bd.dll</OutputFile> + <OutputFile>helloplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin36bd.lib</ImportLibrary> + <ImportLibrary>helloplugin36d.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -145,13 +145,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin36bd.dll</OutputFile> + <OutputFile>helloplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin36bd.lib</ImportLibrary> + <ImportLibrary>helloplugin36d.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -179,12 +179,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin36b.dll</OutputFile> + <OutputFile>helloplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin36b.lib</ImportLibrary> + <ImportLibrary>helloplugin36.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -216,12 +216,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin36b.dll</OutputFile> + <OutputFile>helloplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin36b.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 0556112e6b2..e3dc8efc3a4 100644 --- a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj @@ -78,10 +78,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'">loggerplugin36bd</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">loggerplugin36bd</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">loggerplugin36b</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">loggerplugin36b</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> @@ -107,13 +107,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin36bd.dll</OutputFile> + <OutputFile>loggerplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin36bd.lib</ImportLibrary> + <ImportLibrary>loggerplugin36d.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -145,13 +145,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin36bd.dll</OutputFile> + <OutputFile>loggerplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin36bd.lib</ImportLibrary> + <ImportLibrary>loggerplugin36d.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -179,12 +179,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin36b.dll</OutputFile> + <OutputFile>loggerplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin36b.lib</ImportLibrary> + <ImportLibrary>loggerplugin36.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -216,12 +216,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin36b.dll</OutputFile> + <OutputFile>loggerplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin36b.lib</ImportLibrary> + <ImportLibrary>loggerplugin36.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/cpp/demo/IceGrid/customLoadBalancing/IceGrid.customLoadBalancing.plugin.vcxproj b/cpp/demo/IceGrid/customLoadBalancing/IceGrid.customLoadBalancing.plugin.vcxproj index ce467ea6364..731b26d2892 100755 --- a/cpp/demo/IceGrid/customLoadBalancing/IceGrid.customLoadBalancing.plugin.vcxproj +++ b/cpp/demo/IceGrid/customLoadBalancing/IceGrid.customLoadBalancing.plugin.vcxproj @@ -78,10 +78,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'">registryplugin36bd</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">registryplugin36bd</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">registryplugin36b</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">registryplugin36b</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">registryplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">registryplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">registryplugin36</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">registryplugin36</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> @@ -107,13 +107,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>setargv.obj;glacier2d.lib;icegridd.lib;iced.lib;iceutild.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>registryplugin36bd.dll</OutputFile> + <OutputFile>registryplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>registryplugin36bd.lib</ImportLibrary> + <ImportLibrary>registryplugin36d.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -145,13 +145,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>setargv.obj;glacier2d.lib;icegridd.lib;iced.lib;iceutild.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>registryplugin36bd.dll</OutputFile> + <OutputFile>registryplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>registryplugin36bd.lib</ImportLibrary> + <ImportLibrary>registryplugin36d.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -179,12 +179,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>setargv.obj;glacier2.lib;icegrid.lib;ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>registryplugin36b.dll</OutputFile> + <OutputFile>registryplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>registryplugin36b.lib</ImportLibrary> + <ImportLibrary>registryplugin36.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -216,12 +216,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>setargv.obj;glacier2.lib;icegrid.lib;ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>registryplugin36b.dll</OutputFile> + <OutputFile>registryplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>registryplugin36b.lib</ImportLibrary> + <ImportLibrary>registryplugin36.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/cpp/demo/IcePatch2/MFC/PatchClient.rc b/cpp/demo/IcePatch2/MFC/PatchClient.rc index dd603258781..dfbcdb8d476 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "PatchClient.exe\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "PatchClient.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox index 85c71094921..0b96d0e7016 100644 --- a/cpp/demo/IceStorm/clock/config.icebox +++ b/cpp/demo/IceStorm/clock/config.icebox @@ -10,7 +10,7 @@ Ice.Admin.InstanceName=icebox # The IceStorm service. The service is configured using a separate # configuration file (see config.service). # -IceBox.Service.IceStorm=IceStormService,36b: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 d3c9980179b..41a119cab84 100644 --- a/cpp/demo/IceStorm/counter/config.icebox +++ b/cpp/demo/IceStorm/counter/config.icebox @@ -7,7 +7,7 @@ Ice.Admin.InstanceName=icebox # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,36b: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 90cf9ba81fe..cb3132d4f3a 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,36b: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 d471e7c5de4..11abad1ae26 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,36b: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 8af7d93c9e9..63c1e20278f 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib1 +++ b/cpp/demo/IceStorm/replicated2/config.ib1 @@ -7,7 +7,7 @@ Ice.Admin.InstanceName=icebox1 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,36b: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 31a4424c99b..d7afdb2ef45 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib2 +++ b/cpp/demo/IceStorm/replicated2/config.ib2 @@ -7,7 +7,7 @@ Ice.Admin.InstanceName=icebox2 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,36b: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 2da9ad9d0d3..9c7cf171ae8 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib3 +++ b/cpp/demo/IceStorm/replicated2/config.ib3 @@ -7,7 +7,7 @@ Ice.Admin.InstanceName=icebox3 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,36b: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 da042feab96..e885194745a 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,36b: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,36b: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,36b: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 1272b85997d..71dac587fab 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.6b/reference -IndexDir /var/www/html/doc/Ice-3.6b/manual +IndexDir /var/www/html/doc/Ice-3.6.0/reference +IndexDir /var/www/html/doc/Ice-3.6.0/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 8ab0086ccec..86ba8247ea2 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.6b'; +my $ice_version = '3.6.0'; 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 0ae317de2e1..9cfb9163c8a 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -228,7 +228,7 @@ typedef long long Int64; // // The Ice version. // -#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 +#define ICE_STRING_VERSION "3.6.0" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30600 // AABBCC, with AA=major, BB=minor, CC=patch #endif diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc index eb0baea08f2..da8c9b4d968 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "freeze36bd\0" - #define ORIGINALFILENAME "freeze36bd.dll\0" + #define INTERNALNAME "freeze36d\0" + #define ORIGINALFILENAME "freeze36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "freeze36b\0" - #define ORIGINALFILENAME "freeze36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc index 3bcd38da782..b6d2ba968e1 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "dumpdb\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "dumpdb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc index 27782656e42..0f2c4541957 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "transformdb\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "transformdb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc index ff3408ad9a8..eb98d597c8d 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "glacier2router\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "glacier2router.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc index d0330729e38..9a8b26fd008 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc index 92277953bfc..80e912ac7c0 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "glacier236bd\0" - #define ORIGINALFILENAME "glacier236bd.dll\0" + #define INTERNALNAME "glacier236d\0" + #define ORIGINALFILENAME "glacier236d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "glacier236b\0" - #define ORIGINALFILENAME "glacier236b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc index 4e75810d1aa..0f7c7ac24bc 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "ice36bd\0" - #define ORIGINALFILENAME "ice36bd.dll\0" + #define INTERNALNAME "ice36d\0" + #define ORIGINALFILENAME "ice36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "ice36b\0" - #define ORIGINALFILENAME "ice36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc index 35c33d18aca..fdae99c9324 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icebox36bd\0" - #define ORIGINALFILENAME "icebox36bd.dll\0" + #define INTERNALNAME "icebox36d\0" + #define ORIGINALFILENAME "icebox36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icebox36b\0" - #define ORIGINALFILENAME "icebox36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc index 88548f3ed2e..3d8a981d33b 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "iceboxadmin\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "iceboxadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc index 7ee8d1e05b4..c1659b2fb04 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceDiscovery/IceDiscovery.rc b/cpp/src/IceDiscovery/IceDiscovery.rc index 36e595dc196..1960b58463d 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icediscovery36bd\0" - #define ORIGINALFILENAME "icediscovery36bd.dll\0" + #define INTERNALNAME "icediscovery36d\0" + #define ORIGINALFILENAME "icediscovery36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icediscovery36b\0" - #define ORIGINALFILENAME "icediscovery36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc index 3c875c5f50a..38764a16dfe 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "icegridadmin\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icegridadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc index 42459b81a58..30efd5e65d2 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "icegridnode\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icegridnode.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc index 6c229518ab3..e61a4d9ebd1 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "icegridregistry\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icegridregistry.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc index 61472122c73..cb90d223d37 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icegrid36bd\0" - #define ORIGINALFILENAME "icegrid36bd.dll\0" + #define INTERNALNAME "icegrid36d\0" + #define ORIGINALFILENAME "icegrid36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icegrid36b\0" - #define ORIGINALFILENAME "icegrid36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc index 6505852a6c5..f7fbde9ad7a 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "icepatch2calc\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icepatch2calc.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc index e2d6c617792..f50943d43a8 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "icepatch2client\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icepatch2client.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc index 551b8e0a0b9..0a2540c67ca 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "icepatch2server\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icepatch2server.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc index f57711f337b..becd955a8fe 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icepatch236bd\0" - #define ORIGINALFILENAME "icepatch236bd.dll\0" + #define INTERNALNAME "icepatch236d\0" + #define ORIGINALFILENAME "icepatch236d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icepatch236b\0" - #define ORIGINALFILENAME "icepatch236b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc index 0d148568cfb..e09c52e9a04 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icessl36bd\0" - #define ORIGINALFILENAME "icessl36bd.dll\0" + #define INTERNALNAME "icessl36d\0" + #define ORIGINALFILENAME "icessl36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icessl36b\0" - #define ORIGINALFILENAME "icessl36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc index cb02520b2cb..66849978b8a 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "icestormadmin\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icestormadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc index faaaa4acea6..ea5f92c82fa 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestormdb36bd\0" - #define ORIGINALFILENAME "icestormdb36bd.dll\0" + #define INTERNALNAME "icestormdb36d\0" + #define ORIGINALFILENAME "icestormdb36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestormdb36b\0" - #define ORIGINALFILENAME "icestormdb36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormMigrate.rc b/cpp/src/IceStorm/IceStormMigrate.rc index bbb046e84a9..9d7d8e90570 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "icestormmigrate\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icestormmigrate.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc index 8e2e5770221..b7b34c36f8e 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestormservice36bd\0" - #define ORIGINALFILENAME "icestormservice36bd.dll\0" + #define INTERNALNAME "icestormservice36d\0" + #define ORIGINALFILENAME "icestormservice36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestormservice36b\0" - #define ORIGINALFILENAME "icestormservice36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc index fa4866ecd29..d64412f0d71 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestorm36bd\0" - #define ORIGINALFILENAME "icestorm36bd.dll\0" + #define INTERNALNAME "icestorm36d\0" + #define ORIGINALFILENAME "icestorm36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestorm36b\0" - #define ORIGINALFILENAME "icestorm36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc index 0c24ffed886..5828ea9c3a0 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "iceutil36bd\0" - #define ORIGINALFILENAME "iceutil36bd.dll\0" + #define INTERNALNAME "iceutil36d\0" + #define ORIGINALFILENAME "iceutil36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "iceutil36b\0" - #define ORIGINALFILENAME "iceutil36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc index 32a371a6fae..2ba1dc3cf83 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icexml36bd\0" - #define ORIGINALFILENAME "icexml36bd.dll\0" + #define INTERNALNAME "icexml36d\0" + #define ORIGINALFILENAME "icexml36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icexml36b\0" - #define ORIGINALFILENAME "icexml36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc index f07858b56b2..4f01c4b89da 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "slice36bd\0" - #define ORIGINALFILENAME "slice36bd.dll\0" + #define INTERNALNAME "slice36d\0" + #define ORIGINALFILENAME "slice36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "slice36b\0" - #define ORIGINALFILENAME "slice36b.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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca index 6d2a8c0d362..2b725f814cc 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.6b"] + "/usr/share/Ice-3.6.0"] 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 c6cd5838edb..b6bfdf32b77 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "iceserviceinstall\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "iceserviceinstall.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc index 023751840ed..68395d56deb 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2confluence\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2confluence.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc index 5e35704aed8..f38e5171d6f 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2cpp\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2cpp.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc index 749c93fcb5b..7119e6ed8ab 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2cs\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2cs.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc index dc7b7e52e9e..64ee33cb09c 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2freeze\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2freeze.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc index 51adf54c377..810aa269f4e 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2freezej\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2freezej.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc index 5ba6541c4e6..033ab06bd3c 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2html\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2html.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc index 93807a8364a..f5c3b5870bb 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2java\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2java.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2js/Slice2Js.rc b/cpp/src/slice2js/Slice2Js.rc index fcb0cf7f2b3..a0d6edd440e 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2js\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2js.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc index 1a2f6cedd16..f53b13c973f 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2py\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2py.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc index 1a2f6cedd16..f53b13c973f 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2py\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2py.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc index 617432d7c6c..ee63b456aee 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,6,51,0 - PRODUCTVERSION 3,6,51,0 + FILEVERSION 3,6,0,0 + PRODUCTVERSION 3,6,0,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.6b\0" + VALUE "FileVersion", "3.6.0\0" VALUE "InternalName", "slice2rb\0" VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2rb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6b\0" + VALUE "ProductVersion", "3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml index 28cb265f50e..15d66b1cbc1 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,36b:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,36:createIceStorm"> <dbenv name="${service}"/> |