Skip to content

Commit 0b12bd4

Browse files
author
Ognjen Sobajic
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into development
2 parents 0790995 + eb4b72f commit 0b12bd4

File tree

74 files changed

+350
-1657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+350
-1657
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#Visual Studio files
2+
*.o
3+
*.d
4+
*.so
25
*.[Oo]bj
36
*.user
47
*.aps
@@ -38,3 +41,4 @@ obj/
3841
*.resfiles
3942
[Bb]in
4043
Binaries/
44+
Intermediate/

‎Build/Common.Build.settings

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
<!-- paths can be overridden by configuration -->
3636
<PropertyGroup>
3737
<OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
38-
<!-- $(Configuration) below is added to place Debug/Release Casablanca bits into different folders when compiled in razzle.
39-
It does not affect NativeCloud build, because environment.casablanca.settings overrides OutDir unconditionally -->
40-
<OutDir>$(OutputPath)$(Configuration)</OutDir>
38+
<OutDir>$(OutputPath)</OutDir>
4139
<MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)'==''">$(BuildRoot)\Build\MSBuild.Community.Tasks</MSBuildCommunityTasksPath>
4240
<WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\Build\Wix\3.6\</WixToolPath>
4341
<WixExtDir Condition="'$(WixExtDir)'==''">$(WixToolPath)</WixExtDir>

‎Build/version.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<CppRestBaseFileName>cpprest</CppRestBaseFileName>
5+
<CppRestSDKVersionMajor>1</CppRestSDKVersionMajor>
6+
<CppRestSDKVersionMinor>1</CppRestSDKVersionMinor>
7+
<CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
8+
<CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
9+
<CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>
10+
</PropertyGroup>
11+
</Project>

‎Release/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ bad:
55

66
#CXX=clang
77
#CXX=/usr/lib/gcc-snapshot/bin/g++
8-
CXX=g++-4.7
8+
CXX=g++-4.8
99
export CXX
1010

1111
mk_out_dir:
@@ -29,7 +29,7 @@ clean: DOUTPUT_DIR = $(PWD)/../Binaries/$(DMODE)
2929
export MODE
3030

3131
WARNINGS=-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code
32-
SUPPRESSIONS=-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-deprecated -Wno-unused-value
32+
SUPPRESSIONS=-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-deprecated -Wno-unused-value -Wno-unused-local-typedefs
3333

3434
# C++11 excludes GCC < 4.7, which is desired anyway
3535
OTHER_OPTIONS=-std=c++11 -fno-strict-aliasing

‎Release/casablanca110.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "streams110_test", "tests\Fu
2525
EndProject
2626
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Uri110_test", "tests\Functional\uri\VS11\Uri110_test.vcxproj", "{3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}"
2727
EndProject
28-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testlistener110", "tests\Functional\http\utilities\testlistener\VS11\testlistener110.vcxproj", "{5614BAFA-7605-41D3-945F-7EEB8116398F}"
29-
EndProject
3028
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca110.winrt", "src\build\casablanca110.winrt.vcxproj", "{198ED804-2655-4D92-8104-C220E3EA9452}"
3129
EndProject
3230
Global
@@ -256,18 +254,6 @@ Global
256254
{3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}.Release|Win32.Build.0 = Release|Win32
257255
{3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}.Release|x64.ActiveCfg = Release|x64
258256
{3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}.Release|x64.Build.0 = Release|x64
259-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|ARM.ActiveCfg = Debug|ARM
260-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|ARM.Build.0 = Debug|ARM
261-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|Win32.ActiveCfg = Debug|Win32
262-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|Win32.Build.0 = Debug|Win32
263-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|x64.ActiveCfg = Debug|x64
264-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Debug|x64.Build.0 = Debug|x64
265-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|ARM.ActiveCfg = Release|ARM
266-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|ARM.Build.0 = Release|ARM
267-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|Win32.ActiveCfg = Release|Win32
268-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|Win32.Build.0 = Release|Win32
269-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|x64.ActiveCfg = Release|x64
270-
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|x64.Build.0 = Release|x64
271257
{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|ARM.ActiveCfg = Debug|ARM
272258
{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|ARM.Build.0 = Debug|ARM
273259
{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|Win32.ActiveCfg = Debug|Win32

‎Release/collateral/MakeZip/MakeZip.proj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<Delete Files="$(BuildRoot)\Release\Collateral\MakeZip\$(ZipFileName)" />
1616
</Target>
1717
<Target Name="Build">
18+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC10" OverwriteReadOnlyFiles="true"/>
19+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
20+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
21+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
22+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
1823
<ItemGroup>
1924
<DefaultExclude Include="$(SamplesFolder)\**\bin\**" />
2025
<DefaultExclude Include="$(SamplesFolder)\**\ipch\**" />

‎Release/collateral/Samples/BingRequest/VC10/BingRequest.vcxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<ProjectGuid>{BC7664BD-F33B-433C-AB8D-3530A914F5EC}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
</PropertyGroup>
25+
<!-- this file must exist in the same directory as the project file: -->
26+
<Import Project="version.props" />
2527
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2628
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2729
<ConfigurationType>Application</ConfigurationType>
@@ -86,7 +88,7 @@
8688
<Link>
8789
<SubSystem>Console</SubSystem>
8890
<GenerateDebugInformation>true</GenerateDebugInformation>
89-
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
91+
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
9092
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9193
</Link>
9294
<PostBuildEvent>
@@ -105,7 +107,7 @@
105107
<Link>
106108
<SubSystem>Console</SubSystem>
107109
<GenerateDebugInformation>true</GenerateDebugInformation>
108-
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
110+
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
109111
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
110112
</Link>
111113
<PostBuildEvent>
@@ -127,7 +129,7 @@
127129
<GenerateDebugInformation>true</GenerateDebugInformation>
128130
<EnableCOMDATFolding>true</EnableCOMDATFolding>
129131
<OptimizeReferences>true</OptimizeReferences>
130-
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
132+
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
131133
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
132134
</Link>
133135
<PostBuildEvent>
@@ -150,7 +152,7 @@
150152
<GenerateDebugInformation>true</GenerateDebugInformation>
151153
<EnableCOMDATFolding>true</EnableCOMDATFolding>
152154
<OptimizeReferences>true</OptimizeReferences>
153-
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
155+
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
154156
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155157
</Link>
156158
<PostBuildEvent>

‎Release/collateral/Samples/BingRequest/VC10/copydlls.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
)
77
)
88

9-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca100.dll" %2
10-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca100.pdb" %2
9+
@copy "%CASABLANCA_SDK%\bin\%1\*.dll" %2
10+
@copy "%CASABLANCA_SDK%\bin\%1\*.pdb" %2

‎Release/collateral/Samples/BingRequest/VC11/BingRequest.vcxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<Keyword>Win32Proj</Keyword>
2424
<VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
2525
</PropertyGroup>
26+
<!-- this file must exist in the same directory as the project file: -->
27+
<Import Project="version.props" />
2628
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2729
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2830
<ConfigurationType>Application</ConfigurationType>
@@ -91,7 +93,7 @@
9193
<Link>
9294
<SubSystem>Console</SubSystem>
9395
<GenerateDebugInformation>true</GenerateDebugInformation>
94-
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
96+
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
9597
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9698
</Link>
9799
<PostBuildEvent>
@@ -110,7 +112,7 @@
110112
<Link>
111113
<SubSystem>Console</SubSystem>
112114
<GenerateDebugInformation>true</GenerateDebugInformation>
113-
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
115+
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
114116
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115117
</Link>
116118
<PostBuildEvent>
@@ -132,7 +134,7 @@
132134
<GenerateDebugInformation>true</GenerateDebugInformation>
133135
<EnableCOMDATFolding>true</EnableCOMDATFolding>
134136
<OptimizeReferences>true</OptimizeReferences>
135-
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
137+
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
136138
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
137139
</Link>
138140
<PostBuildEvent>
@@ -155,7 +157,7 @@
155157
<GenerateDebugInformation>true</GenerateDebugInformation>
156158
<EnableCOMDATFolding>true</EnableCOMDATFolding>
157159
<OptimizeReferences>true</OptimizeReferences>
158-
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
160+
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
159161
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
160162
</Link>
161163
<PostBuildEvent>

‎Release/collateral/Samples/BingRequest/VC11/copydlls.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
)
77
)
88

9-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca110.dll" %2
10-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca110.pdb" %2
9+
@copy "%CASABLANCA_SDK%\bin\%1\*.dll" %2
10+
@copy "%CASABLANCA_SDK%\bin\%1\*.pdb" %2

0 commit comments

Comments
 (0)