summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xallDemos.py5
-rw-r--r--cpp/demo/Database/Oracle/occi/client.vcxproj2
-rw-r--r--cpp/demo/Database/Oracle/occi/server.vcxproj2
-rw-r--r--cpp/demo/Database/Oracle/proc/client.vcxproj2
-rw-r--r--cpp/demo/Database/Oracle/proc/client.vcxproj.filters1
-rw-r--r--cpp/demo/Database/Oracle/proc/server.vcxproj2
-rw-r--r--cpp/demo/Database/Oracle/proc/server.vcxproj.filters1
-rw-r--r--cpp/demo/Ice/converter/Ice.converter.client.vcxproj232
-rw-r--r--cpp/demo/Ice/converter/Ice.converter.client.vcxproj.filters43
-rw-r--r--cpp/demo/Ice/converter/Ice.converter.server.vcxproj10
-rw-r--r--cpp/demo/demo-oracle.sln4
-rw-r--r--cpp/demo/demo.sln33
-rwxr-xr-xdistribution/bin/testicedist.py22
13 files changed, 42 insertions, 317 deletions
diff --git a/allDemos.py b/allDemos.py
index 073057a85b9..a026acef24d 100755
--- a/allDemos.py
+++ b/allDemos.py
@@ -15,10 +15,7 @@ from demoscript import *
demoGroups = []
-if os.path.isdir("cpp"):
- subdirs = [ "cpp", "java", "cs", "py", "rb", "js"]
-else:
- subdirs = [ "demo", "demoj", "democs", "demopy", "demorb", "demojs"]
+subdirs = [ "cpp", "java", "cs", "py", "rb", "js"]
for d in subdirs:
diff --git a/cpp/demo/Database/Oracle/occi/client.vcxproj b/cpp/demo/Database/Oracle/occi/client.vcxproj
index a3ab08e8a23..6d6f4c9cd8d 100644
--- a/cpp/demo/Database/Oracle/occi/client.vcxproj
+++ b/cpp/demo/Database/Oracle/occi/client.vcxproj
@@ -18,10 +18,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/cpp/demo/Database/Oracle/occi/server.vcxproj b/cpp/demo/Database/Oracle/occi/server.vcxproj
index 75f72952633..85b55ae9aad 100644
--- a/cpp/demo/Database/Oracle/occi/server.vcxproj
+++ b/cpp/demo/Database/Oracle/occi/server.vcxproj
@@ -18,10 +18,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/cpp/demo/Database/Oracle/proc/client.vcxproj b/cpp/demo/Database/Oracle/proc/client.vcxproj
index 06da7a3e2a6..a8ad7181bd9 100644
--- a/cpp/demo/Database/Oracle/proc/client.vcxproj
+++ b/cpp/demo/Database/Oracle/proc/client.vcxproj
@@ -18,10 +18,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/cpp/demo/Database/Oracle/proc/client.vcxproj.filters b/cpp/demo/Database/Oracle/proc/client.vcxproj.filters
index 71c47f5d931..a8a3abec9bc 100644
--- a/cpp/demo/Database/Oracle/proc/client.vcxproj.filters
+++ b/cpp/demo/Database/Oracle/proc/client.vcxproj.filters
@@ -32,5 +32,6 @@
<Filter>Resource Files</Filter>
</None>
<None Include="README" />
+ <None Include="config.client" />
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/cpp/demo/Database/Oracle/proc/server.vcxproj b/cpp/demo/Database/Oracle/proc/server.vcxproj
index f1920bcca88..b8b49eefbb3 100644
--- a/cpp/demo/Database/Oracle/proc/server.vcxproj
+++ b/cpp/demo/Database/Oracle/proc/server.vcxproj
@@ -18,10 +18,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/cpp/demo/Database/Oracle/proc/server.vcxproj.filters b/cpp/demo/Database/Oracle/proc/server.vcxproj.filters
index 06f89b07e8f..cdd6b614190 100644
--- a/cpp/demo/Database/Oracle/proc/server.vcxproj.filters
+++ b/cpp/demo/Database/Oracle/proc/server.vcxproj.filters
@@ -62,6 +62,7 @@
<Filter>Resource Files</Filter>
</None>
<None Include="README" />
+ <None Include="config.server" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="CurrentSqlContext.pc">
diff --git a/cpp/demo/Ice/converter/Ice.converter.client.vcxproj b/cpp/demo/Ice/converter/Ice.converter.client.vcxproj
deleted file mode 100644
index f4a042a92b8..00000000000
--- a/cpp/demo/Ice/converter/Ice.converter.client.vcxproj
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>client</ProjectName>
- <ProjectGuid>{533951F4-163A-4AD9-A275-ACB8F93D8D0F}</ProjectGuid>
- <RootNamespace>Ice.converter.client</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(ALLUSERSPROFILE)\ZeroC\Ice.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(ALLUSERSPROFILE)\ZeroC\Ice.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(ALLUSERSPROFILE)\ZeroC\Ice.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(ALLUSERSPROFILE)\ZeroC\Ice.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\$(PlatformName)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <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>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;.\generated\client;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <TreatWarningAsError>true</TreatWarningAsError>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <BuildLog>
- <Path>
- </Path>
- </BuildLog>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;.\generated\client;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <TreatWarningAsError>true</TreatWarningAsError>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>.;.\generated\client;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <TreatWarningAsError>true</TreatWarningAsError>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <BuildLog>
- <Path>
- </Path>
- </BuildLog>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>.;.\generated\client;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <TreatWarningAsError>true</TreatWarningAsError>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="Client.cpp">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="generated\client\Greet.cpp" />
- <ClCompile Include="StringConverterI.cpp">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="generated\client\Greet.h" />
- <ClInclude Include="StringConverterI.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Greet.ice" />
- <None Include="config.client" />
- <None Include="README" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
- <ProjectExtensions>
- <VisualStudio>
- <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" ZerocIce_OutputDir=".\generated\client" />
- </VisualStudio>
- </ProjectExtensions>
-</Project> \ No newline at end of file
diff --git a/cpp/demo/Ice/converter/Ice.converter.client.vcxproj.filters b/cpp/demo/Ice/converter/Ice.converter.client.vcxproj.filters
deleted file mode 100644
index 2e2c455fb71..00000000000
--- a/cpp/demo/Ice/converter/Ice.converter.client.vcxproj.filters
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{d3a3b52d-5518-426d-8694-23d3440ec27d}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{4eb2b846-be24-4a07-b335-514c6650b340}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{25dc476f-3a93-4450-86d3-5b9fa707d3d5}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="Client.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="StringConverterI.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="generated\client\Greet.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="StringConverterI.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="generated\client\Greet.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <None Include="Greet.ice">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="README" />
- <None Include="config.client" />
- </ItemGroup>
-</Project> \ No newline at end of file
diff --git a/cpp/demo/Ice/converter/Ice.converter.server.vcxproj b/cpp/demo/Ice/converter/Ice.converter.server.vcxproj
index e53bbd8e9fb..c2fd97eb3cd 100644
--- a/cpp/demo/Ice/converter/Ice.converter.server.vcxproj
+++ b/cpp/demo/Ice/converter/Ice.converter.server.vcxproj
@@ -97,7 +97,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -129,7 +129,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -157,7 +157,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -188,7 +188,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -226,7 +226,7 @@
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
- <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" ZerocIce_OutputDir=".\generated\server" />
+ <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="3.6" ZerocIce_OutputDir=".\generated\server" />
</VisualStudio>
</ProjectExtensions>
</Project> \ No newline at end of file
diff --git a/cpp/demo/demo-oracle.sln b/cpp/demo/demo-oracle.sln
index 837155b5558..678a963ce6d 100644
--- a/cpp/demo/demo-oracle.sln
+++ b/cpp/demo/demo-oracle.sln
@@ -1,6 +1,6 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Oracle", "Oracle", "{22A022BD-EC5A-4A25-A934-B54BEF313FEB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "proc", "proc", "{E071EB99-B198-4A20-BCE1-F420B362217A}"
diff --git a/cpp/demo/demo.sln b/cpp/demo/demo.sln
index 108028d7df6..ad251528c7e 100644
--- a/cpp/demo/demo.sln
+++ b/cpp/demo/demo.sln
@@ -163,8 +163,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "Ice\callback\Ice.
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "Ice\callback\Ice.callback.server.vcxproj", "{5B71F2A4-0901-418C-8E11-986EE6362870}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "Ice\converter\Ice.converter.client.vcxproj", "{533951F4-163A-4AD9-A275-ACB8F93D8D0F}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "Ice\converter\Ice.converter.server.vcxproj", "{64B05645-6A26-412D-B428-8369364DF61C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "Ice\hello\Ice.hello.client.vcxproj", "{710A52F2-A014-4CB2-AF40-348D48DBCDDD}"
@@ -327,6 +325,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "IceDiscovery\repl
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "IceDiscovery\replication\IceDiscovery.replication.server.vcxproj", "{48DC4EB0-02FE-41CC-BE3F-00911817E777}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client1", "Ice\converter\Ice.converter.client1.vcxproj", "{533951F4-163A-4AD9-A275-ACB8F93D8D0F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client2", "Ice\converter\Ice.converter.client2.vcxproj", "{2B67A072-FCDD-4D85-A604-48665353A7A4}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -559,14 +561,6 @@ Global
{5B71F2A4-0901-418C-8E11-986EE6362870}.Release|Win32.Build.0 = Release|Win32
{5B71F2A4-0901-418C-8E11-986EE6362870}.Release|x64.ActiveCfg = Release|x64
{5B71F2A4-0901-418C-8E11-986EE6362870}.Release|x64.Build.0 = Release|x64
- {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Debug|Win32.ActiveCfg = Debug|Win32
- {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Debug|Win32.Build.0 = Debug|Win32
- {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Debug|x64.ActiveCfg = Debug|x64
- {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Debug|x64.Build.0 = Debug|x64
- {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Release|Win32.ActiveCfg = Release|Win32
- {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Release|Win32.Build.0 = Release|Win32
- {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Release|x64.ActiveCfg = Release|x64
- {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Release|x64.Build.0 = Release|x64
{64B05645-6A26-412D-B428-8369364DF61C}.Debug|Win32.ActiveCfg = Debug|Win32
{64B05645-6A26-412D-B428-8369364DF61C}.Debug|Win32.Build.0 = Debug|Win32
{64B05645-6A26-412D-B428-8369364DF61C}.Debug|x64.ActiveCfg = Debug|x64
@@ -1159,6 +1153,22 @@ Global
{48DC4EB0-02FE-41CC-BE3F-00911817E777}.Release|Win32.Build.0 = Release|Win32
{48DC4EB0-02FE-41CC-BE3F-00911817E777}.Release|x64.ActiveCfg = Release|x64
{48DC4EB0-02FE-41CC-BE3F-00911817E777}.Release|x64.Build.0 = Release|x64
+ {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Debug|Win32.Build.0 = Debug|Win32
+ {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Debug|x64.ActiveCfg = Debug|x64
+ {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Debug|x64.Build.0 = Debug|x64
+ {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Release|Win32.ActiveCfg = Release|Win32
+ {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Release|Win32.Build.0 = Release|Win32
+ {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Release|x64.ActiveCfg = Release|x64
+ {533951F4-163A-4AD9-A275-ACB8F93D8D0F}.Release|x64.Build.0 = Release|x64
+ {2B67A072-FCDD-4D85-A604-48665353A7A4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2B67A072-FCDD-4D85-A604-48665353A7A4}.Debug|Win32.Build.0 = Debug|Win32
+ {2B67A072-FCDD-4D85-A604-48665353A7A4}.Debug|x64.ActiveCfg = Debug|x64
+ {2B67A072-FCDD-4D85-A604-48665353A7A4}.Debug|x64.Build.0 = Debug|x64
+ {2B67A072-FCDD-4D85-A604-48665353A7A4}.Release|Win32.ActiveCfg = Release|Win32
+ {2B67A072-FCDD-4D85-A604-48665353A7A4}.Release|Win32.Build.0 = Release|Win32
+ {2B67A072-FCDD-4D85-A604-48665353A7A4}.Release|x64.ActiveCfg = Release|x64
+ {2B67A072-FCDD-4D85-A604-48665353A7A4}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1248,8 +1258,9 @@ Global
{FC895988-01DA-4B5C-8D38-C1CB68F93EF5} = {FE2C2323-2E76-4902-AEA4-9E97218AAB61}
{570A810E-6888-4D21-A6AD-976B0350F42E} = {2A27A719-1C07-40D3-A62A-CD6226A3DF22}
{5B71F2A4-0901-418C-8E11-986EE6362870} = {2A27A719-1C07-40D3-A62A-CD6226A3DF22}
- {533951F4-163A-4AD9-A275-ACB8F93D8D0F} = {9ACB6E02-2397-450E-BA42-7EFFD4EDAA8E}
{64B05645-6A26-412D-B428-8369364DF61C} = {9ACB6E02-2397-450E-BA42-7EFFD4EDAA8E}
+ {533951F4-163A-4AD9-A275-ACB8F93D8D0F} = {9ACB6E02-2397-450E-BA42-7EFFD4EDAA8E}
+ {2B67A072-FCDD-4D85-A604-48665353A7A4} = {9ACB6E02-2397-450E-BA42-7EFFD4EDAA8E}
{710A52F2-A014-4CB2-AF40-348D48DBCDDD} = {6A768404-4A49-4500-A166-3246B2538004}
{25843122-783A-45E0-8D42-612C72D3B183} = {6A768404-4A49-4500-A166-3246B2538004}
{798DC5EC-427F-49A6-9028-F2A420CCEA4B} = {95846583-EF56-4EFC-A6E9-DF6250B25FE6}
diff --git a/distribution/bin/testicedist.py b/distribution/bin/testicedist.py
index c40783a4996..12e255fffe6 100755
--- a/distribution/bin/testicedist.py
+++ b/distribution/bin/testicedist.py
@@ -526,24 +526,6 @@ class Platform:
def getJavaVersion(self, config):
return config[4:] if config.startswith("java") else "1.7"
- def getDemoDir(self, lang):
- if lang == "cpp":
- return "demo"
- elif lang == "cs":
- return "democs"
- elif lang == "java":
- return "demoj"
- elif lang == "php":
- return "demophp"
- elif lang == "py":
- return "demopy"
- elif lang == "rb":
- return "demorb"
- elif lang == "vb":
- return "demovb"
- elif lang == "js":
- return "demojs"
-
def getJavaHome(self, arch, version):
return None
@@ -825,7 +807,7 @@ class Platform:
if sourceArchive:
buildDir = os.path.join(self._sourceDir, lang, "demo")
else:
- buildDir = os.path.join(self._demoDir, self.getDemoDir(lang))
+ buildDir = os.path.join(self._demoDir, lang)
commands = self.makeDemosCommand(compiler, arch, buildConfiguration, lang, buildDir) if lang != "java" else "./gradlew assemble"
if type(commands) == str:
@@ -856,7 +838,7 @@ class Platform:
if sourceArchive:
sourceDir = os.path.join(self._sourceDir, lang)
else:
- sourceDir = os.path.join(self._demoDir, self.getDemoDir(lang))
+ sourceDir = os.path.join(self._demoDir, lang)
os.chdir(sourceDir)
results.setSourceDir(sourceDir)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:09:21 +0000