Skip to content

Commit 40ce666

Browse files
committed
Removing Poco from test websocket server, entirely using WebSocket++.
1 parent 9cc7758 commit 40ce666

File tree

4 files changed

+13
-302
lines changed

4 files changed

+13
-302
lines changed

Build/Common.Build.settings

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</MSBuildAllProjects>
1010
</PropertyGroup>
1111

12-
<!-- defualt configuration -->
12+
<!-- default configuration -->
1313
<PropertyGroup>
1414
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
1515
<Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -60,7 +60,6 @@
6060
<PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\packages')">$(BuildRoot)\packages</PackagesRoot>
6161
<PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\packages')">$(BuildRoot)\..\Tools\packages</PackagesRoot>
6262
<CollateralsDir>$(BuildRoot)\Release\Collateral</CollateralsDir>
63-
<PocoRoot Condition="'$(PocoRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)')">$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)</PocoRoot>
6463
</PropertyGroup>
6564

6665
<!-- try locating configuration file -->

Release/tests/Functional/websockets/dirs.proj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
44

5-
<ItemGroup Condition="'$(PocoRoot)'!=''" >
6-
<ProjectFile Include="utilities\dirs.proj"/>
7-
<ProjectFile Include="client\dirs.proj"/>
8-
</ItemGroup>
5+
<ProjectFile Include="utilities\dirs.proj"/>
6+
<ProjectFile Include="client\dirs.proj"/>
97

108
<Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
119

Release/tests/Functional/websockets/utilities/VS11.winrt/websockets_test_utilities110.winrt.vcxproj

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<PrecompiledHeader>Use</PrecompiledHeader>
6767
<Optimization>Disabled</Optimization>
6868
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBSOCKETTESTUTILITY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
69-
<AdditionalIncludeDirectories>$(PocoRoot)\include\Foundation\include;$(PocoRoot)\include\Net\include;..\$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
69+
<AdditionalIncludeDirectories>..\$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
7070
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
7171
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
7272
<CompileAsWinRT>true</CompileAsWinRT>
@@ -75,19 +75,16 @@
7575
<Link>
7676
<SubSystem>Windows</SubSystem>
7777
<GenerateDebugInformation>true</GenerateDebugInformation>
78-
<AdditionalLibraryDirectories>$(PocoRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
78+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
7979
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
8080
</Link>
81-
<PostBuildEvent>
82-
<Command>xcopy $(PocoRoot)\bin $(OutDir) /E /y</Command>
83-
</PostBuildEvent>
8481
</ItemDefinitionGroup>
8582
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8683
<ClCompile>
8784
<PrecompiledHeader>Use</PrecompiledHeader>
8885
<Optimization>Disabled</Optimization>
8986
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBSOCKETTESTUTILITY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
90-
<AdditionalIncludeDirectories>$(PocoRoot)\include\Foundation\include;$(PocoRoot)\include\Net\include;$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
9188
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
9289
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
9390
<CompileAsWinRT>true</CompileAsWinRT>
@@ -96,12 +93,9 @@
9693
<Link>
9794
<SubSystem>Windows</SubSystem>
9895
<GenerateDebugInformation>true</GenerateDebugInformation>
99-
<AdditionalLibraryDirectories>$(PocoRoot)\lib64;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
96+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
10097
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
10198
</Link>
102-
<PostBuildEvent>
103-
<Command>xcopy $(PocoRoot)\bin64 $(OutDir) /E /y</Command>
104-
</PostBuildEvent>
10599
</ItemDefinitionGroup>
106100
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
107101
<ClCompile>
@@ -110,7 +104,7 @@
110104
<FunctionLevelLinking>true</FunctionLevelLinking>
111105
<IntrinsicFunctions>true</IntrinsicFunctions>
112106
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBSOCKETTESTUTILITY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113-
<AdditionalIncludeDirectories>$(PocoRoot)\include\Foundation\include;$(PocoRoot)\include\Net\include;$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
107+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
114108
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
115109
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
116110
<CompileAsWinRT>true</CompileAsWinRT>
@@ -121,12 +115,9 @@
121115
<GenerateDebugInformation>true</GenerateDebugInformation>
122116
<EnableCOMDATFolding>true</EnableCOMDATFolding>
123117
<OptimizeReferences>true</OptimizeReferences>
124-
<AdditionalLibraryDirectories>$(PocoRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
118+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125119
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
126120
</Link>
127-
<PostBuildEvent>
128-
<Command>xcopy $(PocoRoot)\bin $(OutDir) /E /y</Command>
129-
</PostBuildEvent>
130121
</ItemDefinitionGroup>
131122
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
132123
<ClCompile>
@@ -135,7 +126,7 @@
135126
<FunctionLevelLinking>true</FunctionLevelLinking>
136127
<IntrinsicFunctions>true</IntrinsicFunctions>
137128
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBSOCKETTESTUTILITY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
138-
<AdditionalIncludeDirectories>$(PocoRoot)\include\Foundation\include;$(PocoRoot)\include\Net\include;$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
129+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
139130
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
140131
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
141132
<CompileAsWinRT>true</CompileAsWinRT>
@@ -146,12 +137,9 @@
146137
<GenerateDebugInformation>true</GenerateDebugInformation>
147138
<EnableCOMDATFolding>true</EnableCOMDATFolding>
148139
<OptimizeReferences>true</OptimizeReferences>
149-
<AdditionalLibraryDirectories>$(PocoRoot)\lib64;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
140+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
150141
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
151142
</Link>
152-
<PostBuildEvent>
153-
<Command>xcopy $(PocoRoot)\bin64 $(OutDir) /E /y</Command>
154-
</PostBuildEvent>
155143
</ItemDefinitionGroup>
156144
<ItemGroup>
157145
<ProjectReference Include="$(TestRoot)\Common\utilities\vs11\CommonUtilities110.vcxproj">

0 commit comments

Comments
 (0)