Fix incorrect OutDir, which broke setup build;

Fix testlistener project
microsoft · Jul 3, 2013 · 4d75204 · 4d75204
1 parent 77e25bd
commit 4d75204
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/Build/Common.Build.settings b/Build/Common.Build.settings
@@ -35,9 +35,7 @@
   <!-- paths can be overridden by configuration -->
   <PropertyGroup>
     <OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
-    <!-- $(Configuration) below is added to place Debug/Release Casablanca bits into different folders when compiled in razzle.
-         It does not affect NativeCloud build, because environment.casablanca.settings overrides OutDir unconditionally -->
-    <OutDir>$(OutputPath)$(Configuration)</OutDir>
+    <OutDir>$(OutputPath)</OutDir>
     <MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)'==''">$(BuildRoot)\Build\MSBuild.Community.Tasks</MSBuildCommunityTasksPath>
     <WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\Build\Wix\3.6\</WixToolPath>
     <WixExtDir Condition="'$(WixExtDir)'==''">$(WixToolPath)</WixExtDir>

diff --git a/Release/src/http/listener/http_windows_server.cpp b/Release/src/http/listener/http_windows_server.cpp
@@ -28,6 +28,8 @@
 #include "cpprest/http_server_api.h"
 #include "cpprest/http_windows_server.h"
 #include "cpprest/rawptrstream.h"
+#include "cpprest/http_helpers.h"
+#include "cpprest/http_msg.h"
 
 using namespace web; 
 using namespace utility;
@@ -40,7 +42,6 @@ using namespace utility::experimental;
 using namespace logging;
 using namespace logging::log;
 
-
 namespace web { namespace http
 {
 namespace experimental {

diff --git a/Release/tests/Functional/http/utilities/testlistener/VS11/testlistener110.vcxproj b/Release/tests/Functional/http/utilities/testlistener/VS11/testlistener110.vcxproj
@@ -184,12 +184,14 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\logging\log.cpp" />
-    <ClCompile Include="..\src\listener\http_listener.cpp" />
-    <ClCompile Include="..\src\listener\http_msg_listen.cpp" />
-    <ClCompile Include="..\src\listener\http_server_api.cpp" />
-    <ClCompile Include="..\src\listener\http_windows_server.cpp" />
-	<ClCompile Include="..\stdafx.cpp">
+    <ClCompile Include="$(CasablancaSrcDir)\http\logging\log.cpp" />
+    <ClCompile Include="$(CasablancaSrcDir)\http\listener\http_listener.cpp" />
+    <ClCompile Include="$(CasablancaSrcDir)\http\listener\http_msg_listen.cpp" />
+    <ClCompile Include="$(CasablancaSrcDir)\http\listener\http_server_api.cpp" />
+    <ClCompile Include="$(CasablancaSrcDir)\http\listener\http_windows_server.cpp" />
+    <ClCompile Include="$(CasablancaSrcDir)\http\common\http_msg.cpp" />
+    <ClCompile Include="$(CasablancaSrcDir)\http\common\http_helpers.cpp" />
+  <ClCompile Include="..\stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -200,13 +202,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\stdafx.h" />
-    <ClInclude Include="..\include\http_linux_server.h" />
-    <ClInclude Include="..\include\http_listener.h" />
-    <ClInclude Include="..\include\http_server.h" />
-    <ClInclude Include="..\include\http_server_api.h" />
-    <ClInclude Include="..\include\http_windows_server.h" />
-    <ClInclude Include="..\include\logr.h" />
-    <ClInclude Include="..\include\filelog.h" />
+    <ClInclude Include="$(CasablancaSrcDir)\..\include\http_listener.h" />
+    <ClInclude Include="$(CasablancaSrcDir)\..\include\http_server.h" />
+    <ClInclude Include="$(CasablancaSrcDir)\..\include\http_server_api.h" />
+    <ClInclude Include="$(CasablancaSrcDir)\..\include\http_windows_server.h" />
+    <ClInclude Include="$(CasablancaSrcDir)\..\include\logr.h" />
+    <ClInclude Include="$(CasablancaSrcDir)\..\include\filelog.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/Release/tests/Functional/http/utilities/testlistener/stdafx.h b/Release/tests/Functional/http/utilities/testlistener/stdafx.h
@@ -41,10 +41,10 @@
 #include "cpprest/uri.h"
 #include "cpprest/asyncrt_utils.h"
 
-#include "http_server.h"
-#include "http_listener.h"
-#include "http_server_api.h"
-#include "http_windows_server.h"
+#include "cpprest/http_server.h"
+#include "cpprest/http_listener.h"
+#include "cpprest/http_server_api.h"
+#include "cpprest/http_windows_server.h"
 
-#include "log.h"
-#include "filelog.h"
+#include "cpprest/log.h"
+#include "cpprest/filelog.h"