diff options
Diffstat (limited to 'cpp')
67 files changed, 317 insertions, 317 deletions
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index 7a84c9a1445..0d5dba324fd 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,34:createIceStorm"> + <service name="${instance-name}" entry="IceStormService,35b: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,34:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,35b:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj index e0ea9cfdefe..a670ecd9ca0 100644 --- a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj +++ b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj @@ -73,27 +73,27 @@ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -235,7 +235,7 @@ <Text Include="README.txt" />
</ItemGroup>
<ItemGroup>
- <SDKReference Include="IceWinRT, Version=3.4" />
+ <SDKReference Include="IceWinRT, Version=3.5" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.rc b/cpp/demo/Ice/MFC/client/HelloClient.rc index 87f1877bf41..80403dc3054 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2"
+ VALUE "FileVersion", "3.5b"
VALUE "InternalName", "HelloClient.exe"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved."
VALUE "OriginalFilename", "HelloClient.exe"
VALUE "ProductName", "Ice"
- VALUE "ProductVersion", "3.4.2"
+ VALUE "ProductVersion", "3.5b"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.rc b/cpp/demo/Ice/MFC/server/HelloServer.rc index cfae432f3dc..06f732a9ef2 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "HelloServer.exe\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "HelloServer.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcproj b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcproj index 33d7aa74a7b..5443f0b9325 100755 --- a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcproj @@ -72,13 +72,13 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO"
AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="helloplugin34d.dll"
+ OutputFile="helloplugin35bd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(IceHome)\lib""
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="helloplugin34d.lib"
+ ImportLibrary="helloplugin35bd.lib"
TargetMachine="1"
/>
<Tool
@@ -158,13 +158,13 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO"
AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="helloplugin34d.dll"
+ OutputFile="helloplugin35bd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(IceHome)\lib\x64""
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="helloplugin34d.lib"
+ ImportLibrary="helloplugin35bd.lib"
TargetMachine="17"
/>
<Tool
@@ -243,12 +243,12 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /IGNORE:4089"
AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="helloplugin34.dll"
+ OutputFile="helloplugin35b.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(IceHome)\lib""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="helloplugin34.lib"
+ ImportLibrary="helloplugin35b.lib"
TargetMachine="1"
/>
<Tool
@@ -328,12 +328,12 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /IGNORE:4089"
AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="helloplugin34.dll"
+ OutputFile="helloplugin35b.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(IceHome)\lib\x64""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="helloplugin34.lib"
+ ImportLibrary="helloplugin35b.lib"
TargetMachine="17"
/>
<Tool
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcproj b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcproj index 38b722db5e3..5129030b25c 100755 --- a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcproj @@ -72,13 +72,13 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO"
AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="loggerplugin34d.dll"
+ OutputFile="loggerplugin35bd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(IceHome)\lib""
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="loggerplugin34d.lib"
+ ImportLibrary="loggerplugin35bd.lib"
TargetMachine="1"
/>
<Tool
@@ -158,13 +158,13 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO"
AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="loggerplugin34d.dll"
+ OutputFile="loggerplugin35bd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(IceHome)\lib\x64""
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="loggerplugin34d.lib"
+ ImportLibrary="loggerplugin35bd.lib"
TargetMachine="17"
/>
<Tool
@@ -243,12 +243,12 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /IGNORE:4089"
AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="loggerplugin34.dll"
+ OutputFile="loggerplugin35b.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(IceHome)\lib""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="loggerplugin34.lib"
+ ImportLibrary="loggerplugin35b.lib"
TargetMachine="1"
/>
<Tool
@@ -328,12 +328,12 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /IGNORE:4089"
AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="loggerplugin34.dll"
+ OutputFile="loggerplugin35b.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(IceHome)\lib\x64""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="loggerplugin34.lib"
+ ImportLibrary="loggerplugin35b.lib"
TargetMachine="17"
/>
<Tool
diff --git a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj index f9d55797968..f7e18fb02bd 100644 --- a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj +++ b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj @@ -73,27 +73,27 @@ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -214,7 +214,7 @@ <Text Include="README.txt" />
</ItemGroup>
<ItemGroup>
- <SDKReference Include="IceWinRT, Version=3.4" />
+ <SDKReference Include="IceWinRT, Version=3.5" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/Ice/winrt/hello/hello.vcxproj b/cpp/demo/Ice/winrt/hello/hello.vcxproj index aa56278ee1d..e7ef524b73e 100644 --- a/cpp/demo/Ice/winrt/hello/hello.vcxproj +++ b/cpp/demo/Ice/winrt/hello/hello.vcxproj @@ -73,27 +73,27 @@ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -217,7 +217,7 @@ <Text Include="README.txt" />
</ItemGroup>
<ItemGroup>
- <SDKReference Include="IceWinRT, Version=3.4" />
+ <SDKReference Include="IceWinRT, Version=3.5" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/IcePatch2/MFC/PatchClient.rc b/cpp/demo/IcePatch2/MFC/PatchClient.rc index 144d100df2f..9e2e00c40d5 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "PatchClient.exe\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "PatchClient.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox index 7f866a8021f..1ef67c260be 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,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b: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 0019ad9f81b..845b3d42090 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,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b: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 40d1dc55d64..cc7b52a984f 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,34:createIceStorm --Ice.Config=config.service %s"' \ + args = ' --IceBox.Service.IceStorm="IceStormService,35b: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 1bfb5950ced..0be46486840 100644 --- a/cpp/demo/IceStorm/replicated/application.xml +++ b/cpp/demo/IceStorm/replicated/application.xml @@ -21,7 +21,7 @@ <icebox id="${instance-name}-${index}" exe="icebox" activation="on-demand"> - <service name="IceStorm" entry="IceStormService,34:createIceStorm"> + <service name="IceStorm" entry="IceStormService,35b:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/IceStorm/replicated2/config.ib1 b/cpp/demo/IceStorm/replicated2/config.ib1 index 67044a09270..66251b6516d 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,34:createIceStorm --Ice.Config=config.s1 +IceBox.Service.IceStorm=IceStormService,35b: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 49b7c67b3c5..8bb5752441a 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,34:createIceStorm --Ice.Config=config.s2 +IceBox.Service.IceStorm=IceStormService,35b: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 2059f75d38c..b693b48b09d 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,34:createIceStorm --Ice.Config=config.s3 +IceBox.Service.IceStorm=IceStormService,35b: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 748440d2ea6..5d6259393b6 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,34:createIceStorm --Ice.Config=config.s1 %s"' \ + a1 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s1 %s"' \ % Util.defaultHost - a2 = ' --IceBox.Service.IceStorm="IceStormService,34:createIceStorm --Ice.Config=config.s2 %s"' \ + a2 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s2 %s"' \ % Util.defaultHost - a3 = ' --IceBox.Service.IceStorm="IceStormService,34:createIceStorm --Ice.Config=config.s3 %s"' \ + a3 = ' --IceBox.Service.IceStorm="IceStormService,35b: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 96b449026ef..782f3c227d8 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.4.2/reference -IndexDir /var/www/html/doc/Ice-3.4.2/manual +IndexDir /var/www/html/doc/Ice-3.5b/reference +IndexDir /var/www/html/doc/Ice-3.5b/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 96043c9df65..f9506cf916f 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.4.2'; +my $ice_version = '3.5b'; 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 927964224b2..570174b8b78 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -198,7 +198,7 @@ typedef long long Int64; // // The Ice version. // -#define ICE_STRING_VERSION "3.4.2" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30402 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "3.5b" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30551 // AABBCC, with AA=major, BB=minor, CC=patch #endif diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc index 1c7b4aae5a3..132d6591c47 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "freeze34d\0"
- #define ORIGINALFILENAME "freeze34d.dll\0"
+ #define INTERNALNAME "freeze35bd\0"
+ #define ORIGINALFILENAME "freeze35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "freeze34\0"
- #define ORIGINALFILENAME "freeze34.dll\0"
+ #define INTERNALNAME "freeze35b\0"
+ #define ORIGINALFILENAME "freeze35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc index da56258db3f..c0376bae646 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "dumpdb\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "dumpdb.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc index 13b4b6ae10e..2487c3494c9 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "transformdb\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "transformdb.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc index 883a2147820..ec6a49f30f3 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "glacier2router\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "glacier2router.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc index fada42bbc58..b37d90d020d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "glacier234d\0"
- #define ORIGINALFILENAME "glacier234d.dll\0"
+ #define INTERNALNAME "glacier235bd\0"
+ #define ORIGINALFILENAME "glacier235bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "glacier234\0"
- #define ORIGINALFILENAME "glacier234.dll\0"
+ #define INTERNALNAME "glacier235b\0"
+ #define ORIGINALFILENAME "glacier235b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc index 1f4d3b26048..f4751cbb31d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "ice34d\0"
- #define ORIGINALFILENAME "ice34d.dll\0"
+ #define INTERNALNAME "ice35bd\0"
+ #define ORIGINALFILENAME "ice35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "ice34\0"
- #define ORIGINALFILENAME "ice34.dll\0"
+ #define INTERNALNAME "ice35b\0"
+ #define ORIGINALFILENAME "ice35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc index 33b6a6a5436..647d29d8b15 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icebox34d\0"
- #define ORIGINALFILENAME "icebox34d.dll\0"
+ #define INTERNALNAME "icebox35bd\0"
+ #define ORIGINALFILENAME "icebox35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icebox34\0"
- #define ORIGINALFILENAME "icebox34.dll\0"
+ #define INTERNALNAME "icebox35b\0"
+ #define ORIGINALFILENAME "icebox35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc index 15935cd2e14..d7db9467e86 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "iceboxadmin\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "iceboxadmin.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc index b3046f9fecf..46be64acc4d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceDB/IceDB.rc b/cpp/src/IceDB/IceDB.rc index 26843f94c9f..9884c59873b 100644 --- a/cpp/src/IceDB/IceDB.rc +++ b/cpp/src/IceDB/IceDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icedb34d\0"
- #define ORIGINALFILENAME "icedb34d.dll\0"
+ #define INTERNALNAME "icedb35bd\0"
+ #define ORIGINALFILENAME "icedb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icedb34\0"
- #define ORIGINALFILENAME "icedb34.dll\0"
+ #define INTERNALNAME "icedb35b\0"
+ #define ORIGINALFILENAME "icedb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceDB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc index eeb50b582c6..6cebf26f9c8 100644 --- a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc +++ b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb34d\0"
- #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"
+ #define INTERNALNAME "icestormfreezedb35bd\0"
+ #define ORIGINALFILENAME "icestormfreezedb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icegridfreezedb34\0"
- #define ORIGINALFILENAME "icegridfreezedb34.dll\0"
+ #define INTERNALNAME "icegridfreezedb35b\0"
+ #define ORIGINALFILENAME "icegridfreezedb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceGrid Freeze DB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc index fdae34b89d9..8184cf0c7f2 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icegridadmin\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icegridadmin.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc index ef87a68df5f..88285e134f2 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icegridnode\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icegridnode.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc index 0f33a2eb1a0..6d8cfc00377 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icegridregistry\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icegridregistry.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index e17cdc115c3..15b9f2f5b4a 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -2263,7 +2263,7 @@ Parser::getInput(char* buf, int& result, int maxSize) } } - result = line.length(); + result = static_cast<int>(line.length()); if(result > maxSize) { error("input line too long"); diff --git a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc index 1946a793145..205ae236733 100644 --- a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc +++ b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegridsqldb34d\0"
- #define ORIGINALFILENAME "icegridsqldb34d.dll\0"
+ #define INTERNALNAME "icegridsqldb35bd\0"
+ #define ORIGINALFILENAME "icegridsqldb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icegridsqldb34\0"
- #define ORIGINALFILENAME "icegridsqldb34.dll\0"
+ #define INTERNALNAME "icegridsqldb35b\0"
+ #define ORIGINALFILENAME "icegridsqldb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceGrid Sql DB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc index 9c427bdd616..48d6fb63a25 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegrid34d\0"
- #define ORIGINALFILENAME "icegrid34d.dll\0"
+ #define INTERNALNAME "icegrid35bd\0"
+ #define ORIGINALFILENAME "icegrid35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icegrid34\0"
- #define ORIGINALFILENAME "icegrid34.dll\0"
+ #define INTERNALNAME "icegrid35b\0"
+ #define ORIGINALFILENAME "icegrid35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc index 6739a3786cd..44b581211ea 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icepatch2calc\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icepatch2calc.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc index 4f6322135a4..956fbeeb31d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icepatch2client\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icepatch2client.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc index ca4ce0f11e2..008bdf969f1 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icepatch2server\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icepatch2server.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc index fb26f368a2c..1665e7b12db 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icepatch234d\0"
- #define ORIGINALFILENAME "icepatch234d.dll\0"
+ #define INTERNALNAME "icepatch235bd\0"
+ #define ORIGINALFILENAME "icepatch235bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icepatch234\0"
- #define ORIGINALFILENAME "icepatch234.dll\0"
+ #define INTERNALNAME "icepatch235b\0"
+ #define ORIGINALFILENAME "icepatch235b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc index cdb78bb48ba..a75720055df 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icessl34d\0"
- #define ORIGINALFILENAME "icessl34d.dll\0"
+ #define INTERNALNAME "icessl35bd\0"
+ #define ORIGINALFILENAME "icessl35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icessl34\0"
- #define ORIGINALFILENAME "icessl34.dll\0"
+ #define INTERNALNAME "icessl35b\0"
+ #define ORIGINALFILENAME "icessl35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc index fc4b351eed0..32748f319ef 100644 --- a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc +++ b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb34d\0"
- #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"
+ #define INTERNALNAME "icestormfreezedb35bd\0"
+ #define ORIGINALFILENAME "icestormfreezedb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestormfreezedb34\0"
- #define ORIGINALFILENAME "icestormfreezedb34.dll\0"
+ #define INTERNALNAME "icestormfreezedb35b\0"
+ #define ORIGINALFILENAME "icestormfreezedb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceStorm Freeze DB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc b/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc index 77268d064bd..5bb5f2fd568 100644 --- a/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc +++ b/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc @@ -1,8 +1,8 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icestormmigrate\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icestormmigrate.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc index 75a084a92c8..c3d83f149ea 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icestormadmin\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icestormadmin.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc index 1388eb06870..cde321c9ba1 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormdb34d\0"
- #define ORIGINALFILENAME "icestormdb34d.dll\0"
+ #define INTERNALNAME "icestormdb35bd\0"
+ #define ORIGINALFILENAME "icestormdb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestormdb34\0"
- #define ORIGINALFILENAME "icestormdb34.dll\0"
+ #define INTERNALNAME "icestormdb35b\0"
+ #define ORIGINALFILENAME "icestormdb35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc index 00f1e9478f4..62202db7f9d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormservice34d\0"
- #define ORIGINALFILENAME "icestormservice34d.dll\0"
+ #define INTERNALNAME "icestormservice35bd\0"
+ #define ORIGINALFILENAME "icestormservice35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestormservice34\0"
- #define ORIGINALFILENAME "icestormservice34.dll\0"
+ #define INTERNALNAME "icestormservice35b\0"
+ #define ORIGINALFILENAME "icestormservice35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc index e681d3c3306..1531305e1f5 100644 --- a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc +++ b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormsqldb34d\0"
- #define ORIGINALFILENAME "icestormsqldb34d.dll\0"
+ #define INTERNALNAME "icestormsqldb35bd\0"
+ #define ORIGINALFILENAME "icestormsqldb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestormsqldb34\0"
- #define ORIGINALFILENAME "icestormsqldb34.dll\0"
+ #define INTERNALNAME "icestormsqldb35b\0"
+ #define ORIGINALFILENAME "icestormsqldb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceStorm Sql DB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc index 59692f147b4..bec2e981187 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestorm34d\0"
- #define ORIGINALFILENAME "icestorm34d.dll\0"
+ #define INTERNALNAME "icestorm35bd\0"
+ #define ORIGINALFILENAME "icestorm35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestorm34\0"
- #define ORIGINALFILENAME "icestorm34.dll\0"
+ #define INTERNALNAME "icestorm35b\0"
+ #define ORIGINALFILENAME "icestorm35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc index d315692a642..52cfdaf4c3a 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "iceutil34d\0"
- #define ORIGINALFILENAME "iceutil34d.dll\0"
+ #define INTERNALNAME "iceutil35bd\0"
+ #define ORIGINALFILENAME "iceutil35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "iceutil34\0"
- #define ORIGINALFILENAME "iceutil34.dll\0"
+ #define INTERNALNAME "iceutil35b\0"
+ #define ORIGINALFILENAME "iceutil35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc index 713aec7e69a..2d19a7377b3 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icexml34d\0"
- #define ORIGINALFILENAME "icexml34d.dll\0"
+ #define INTERNALNAME "icexml35bd\0"
+ #define ORIGINALFILENAME "icexml35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icexml34\0"
- #define ORIGINALFILENAME "icexml34.dll\0"
+ #define INTERNALNAME "icexml35b\0"
+ #define ORIGINALFILENAME "icexml35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc index e5957b1fdab..e814a6f5f38 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "slice34d\0"
- #define ORIGINALFILENAME "slice34d.dll\0"
+ #define INTERNALNAME "slice35bd\0"
+ #define ORIGINALFILENAME "slice35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "slice34\0"
- #define ORIGINALFILENAME "slice34.dll\0"
+ #define INTERNALNAME "slice35b\0"
+ #define ORIGINALFILENAME "slice35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca index 02666ec3ff8..f2b09ef76b4 100755 --- a/cpp/src/ca/iceca +++ b/cpp/src/ca/iceca @@ -116,7 +116,7 @@ if sys.argv[script] == "import": # script ../lib). For development purposes we also check ".". # checkLocations = [".", os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "lib")), - "/usr/share/Ice-3.4.2"] + "/usr/share/Ice-3.5b"] 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 684aaa1a466..0adef7c2faf 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "iceserviceinstall\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "iceserviceinstall.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc index a94c686d17c..495d935ca2d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2confluence\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2confluence.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc index 359cada57cf..d14b0c8edad 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2cpp\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2cpp.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc index 78cb392ba14..b5dca87f0df 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2cs\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2cs.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc index 11bf06a8640..edeba107dab 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2freeze\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2freeze.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc index 3c275e984d3..24aa8d8d5ba 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2freezej\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2freezej.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc index df0a55c032e..f19b8809111 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2html\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2html.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc index 362a58dd266..ff85f68c975 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2java\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2java.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc index 6dfc59e565a..95c768def6e 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2py\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2py.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc index 6dfc59e565a..95c768def6e 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2py\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2py.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc index 15fb99062ca..241d315a905 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2rb\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2rb.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/test/IceGrid/fileLock/run.py b/cpp/test/IceGrid/fileLock/run.py index 2b75cd0d533..188ac04014e 100755 --- a/cpp/test/IceGrid/fileLock/run.py +++ b/cpp/test/IceGrid/fileLock/run.py @@ -27,7 +27,7 @@ IceGridAdmin.nreplicas = 0 def runIceGridRegistry(): iceGrid = "" - if TestUtil.isVC6(): + if TestUtil.isVC90(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml index 5e9a3909543..fd9be048675 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,34:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,35b:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj index 6d3963e6e4d..4a1b656a144 100644 --- a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj +++ b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj @@ -73,27 +73,27 @@ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -399,7 +399,7 @@ </ClCompile>
</ItemGroup>
<ItemGroup>
- <SDKReference Include="IceWinRT, Version=3.4" />
+ <SDKReference Include="IceWinRT, Version=3.5" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
|