Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code
Issues
All Issues

Delta Between Two Patch Sets: MSVS/tests.vcxproj

Issue 10169005: Windows specific changes. All tests passing on Windows. (Closed)
Left Patch Set: Misscommunication fix Created April 9, 2013, 8:03 a.m.
Right Patch Set: Comments address. WIN32 in #ifdef and whitespace Created April 10, 2013, 7:55 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « MSVS/libadblockplus.vcxproj ('k') | include/AdblockPlus/FilterEngine.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso ft.com/developer/msbuild/2003"> 2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso ft.com/developer/msbuild/2003">
3 <ItemGroup Label="ProjectConfigurations"> 3 <ItemGroup Label="ProjectConfigurations">
4 <ProjectConfiguration Include="Debug|Win32"> 4 <ProjectConfiguration Include="Debug|Win32">
5 <Configuration>Debug</Configuration> 5 <Configuration>Debug</Configuration>
6 <Platform>Win32</Platform> 6 <Platform>Win32</Platform>
7 </ProjectConfiguration> 7 </ProjectConfiguration>
8 <ProjectConfiguration Include="Debug|x64">
9 <Configuration>Debug</Configuration>
10 <Platform>x64</Platform>
11 </ProjectConfiguration>
8 <ProjectConfiguration Include="Release|Win32"> 12 <ProjectConfiguration Include="Release|Win32">
9 <Configuration>Release</Configuration> 13 <Configuration>Release</Configuration>
10 <Platform>Win32</Platform> 14 <Platform>Win32</Platform>
15 </ProjectConfiguration>
16 <ProjectConfiguration Include="Release|x64">
17 <Configuration>Release</Configuration>
18 <Platform>x64</Platform>
11 </ProjectConfiguration> 19 </ProjectConfiguration>
12 </ItemGroup> 20 </ItemGroup>
13 <PropertyGroup Label="Globals"> 21 <PropertyGroup Label="Globals">
14 <ProjectGuid>{C7A34BAE-71B0-7ABD-0AA5-19B8A1B9AB2F}</ProjectGuid> 22 <ProjectGuid>{C7A34BAE-71B0-7ABD-0AA5-19B8A1B9AB2F}</ProjectGuid>
15 <Keyword>Win32Proj</Keyword> 23 <Keyword>Win32Proj</Keyword>
16 <RootNamespace>tests</RootNamespace> 24 <RootNamespace>tests</RootNamespace>
17 </PropertyGroup> 25 </PropertyGroup>
18 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 26 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19 <PropertyGroup Label="Configuration"> 27 <PropertyGroup Label="Configuration">
20 <CharacterSet>Unicode</CharacterSet> 28 <CharacterSet>Unicode</CharacterSet>
21 <ConfigurationType>Application</ConfigurationType> 29 <ConfigurationType>Application</ConfigurationType>
22 </PropertyGroup> 30 </PropertyGroup>
23 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Debug|Win32'"> 31 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Debug|Win32'">
24 <PlatformToolset>v110</PlatformToolset> 32 <PlatformToolset>v110</PlatformToolset>
25 </PropertyGroup> 33 </PropertyGroup>
34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label=" Configuration">
35 <PlatformToolset>v110</PlatformToolset>
36 </PropertyGroup>
26 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Release|Win32'"> 37 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Release|Win32'">
38 <PlatformToolset>v110</PlatformToolset>
39 </PropertyGroup>
40 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label ="Configuration">
27 <PlatformToolset>v110</PlatformToolset> 41 <PlatformToolset>v110</PlatformToolset>
28 </PropertyGroup> 42 </PropertyGroup>
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
30 <ImportGroup Label="ExtensionSettings" /> 44 <ImportGroup Label="ExtensionSettings" />
31 <ImportGroup Label="PropertySheets"> 45 <ImportGroup Label="PropertySheets">
32 <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.pro ps')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platf orm).user.props" /> 46 <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.pro ps')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platf orm).user.props" />
33 </ImportGroup> 47 </ImportGroup>
34 <PropertyGroup Label="UserMacros" /> 48 <PropertyGroup Label="UserMacros" />
35 <PropertyGroup> 49 <PropertyGroup>
36 <ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\bin\;$(MSBui ldProjectDirectory)\..\bin\</ExecutablePath> 50 <ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\bin\;$(MSBui ldProjectDirectory)\..\bin\</ExecutablePath>
37 <OutDir>..\build\$(Configuration)\</OutDir> 51 <OutDir>..\build\$(Configuration)\</OutDir>
38 <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> 52 <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir>
39 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" >false</LinkIncremental> 53 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" >false</LinkIncremental>
54 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">f alse</LinkIncremental>
40 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">t rue</LinkIncremental> 55 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">t rue</LinkIncremental>
56 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">tru e</LinkIncremental>
41 <TargetName>$(ProjectName)</TargetName> 57 <TargetName>$(ProjectName)</TargetName>
42 <TargetPath>$(OutDir)\$(ProjectName)$(TargetExt)</TargetPath> 58 <TargetPath>$(OutDir)\$(ProjectName)$(TargetExt)</TargetPath>
43 </PropertyGroup> 59 </PropertyGroup>
44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 60 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
61 <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
62 </PropertyGroup>
63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
45 <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild> 64 <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
46 </PropertyGroup> 65 </PropertyGroup>
47 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" > 66 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" >
48 <ClCompile> 67 <ClCompile>
49 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories> 68 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories>
50 <Optimization>Disabled</Optimization> 69 <Optimization>Disabled</Optimization>
51 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_H EAP;ENABLE_EXTRA_CHECKS;_VARIADIC_MAX=10;FILTER_ENGINE_STUBS=1;_WIN32;_DEBUG;%(P reprocessorDefinitions)</PreprocessorDefinitions> 70 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_H EAP;ENABLE_EXTRA_CHECKS;_VARIADIC_MAX=10;FILTER_ENGINE_STUBS=1;_WIN32;_DEBUG;%(P reprocessorDefinitions)</PreprocessorDefinitions>
52 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 71 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
53 <CompileAsWinRT> 72 <CompileAsWinRT>
54 </CompileAsWinRT> 73 </CompileAsWinRT>
(...skipping 13 matching lines...) Expand all
68 <EntryPointSymbol>mainCRTStartup</EntryPointSymbol> 87 <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
69 </Link> 88 </Link>
70 <ResourceCompile> 89 <ResourceCompile>
71 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories> 90 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories>
72 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_H EAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</P reprocessorDefinitions> 91 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_H EAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</P reprocessorDefinitions>
73 </ResourceCompile> 92 </ResourceCompile>
74 <PostBuildEvent> 93 <PostBuildEvent>
75 <Command>"$(TargetDir)$(TargetFileName)”</Command> 94 <Command>"$(TargetDir)$(TargetFileName)”</Command>
76 </PostBuildEvent> 95 </PostBuildEvent>
77 </ItemDefinitionGroup> 96 </ItemDefinitionGroup>
97 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
98 <ClCompile>
99 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories>
100 <Optimization>Disabled</Optimization>
101 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_H EAP;ENABLE_EXTRA_CHECKS;_VARIADIC_MAX=10;FILTER_ENGINE_STUBS=1;_WIN32;_DEBUG;%(P reprocessorDefinitions)</PreprocessorDefinitions>
102 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
103 <CompileAsWinRT>
104 </CompileAsWinRT>
105 <MultiProcessorCompilation>true</MultiProcessorCompilation>
106 </ClCompile>
107 <Link>
108 <AdditionalDependencies>winmm.lib;ws2_32.lib;</AdditionalDependencies>
109 <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
110 <IgnoreSpecificDefaultLibraries>
111 </IgnoreSpecificDefaultLibraries>
112 <IgnoreAllDefaultLibraries>
113 </IgnoreAllDefaultLibraries>
114 <SubSystem>Console</SubSystem>
115 <AssemblyDebug>true</AssemblyDebug>
116 <GenerateDebugInformation>true</GenerateDebugInformation>
117 <NoEntryPoint>false</NoEntryPoint>
118 <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
119 </Link>
120 <ResourceCompile>
121 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories>
122 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_H EAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</P reprocessorDefinitions>
123 </ResourceCompile>
124 <PostBuildEvent>
125 <Command>"$(TargetDir)$(TargetFileName)”</Command>
126 </PostBuildEvent>
127 </ItemDefinitionGroup>
78 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32 '"> 128 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32 '">
79 <ClCompile> 129 <ClCompile>
80 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories> 130 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories>
81 <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> 131 <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
82 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> 132 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
83 <IntrinsicFunctions>true</IntrinsicFunctions> 133 <IntrinsicFunctions>true</IntrinsicFunctions>
84 <Optimization>MaxSpeed</Optimization> 134 <Optimization>MaxSpeed</Optimization>
85 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> 135 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
86 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 136 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
87 <StringPooling>true</StringPooling> 137 <StringPooling>true</StringPooling>
88 </ClCompile> 138 </ClCompile>
89 <Link> 139 <Link>
90 <AdditionalDependencies>winmm.lib;ws2_32.lib</AdditionalDependencies> 140 <AdditionalDependencies>winmm.lib;ws2_32.lib</AdditionalDependencies>
91 <EnableCOMDATFolding>true</EnableCOMDATFolding> 141 <EnableCOMDATFolding>true</EnableCOMDATFolding>
92 <OptimizeReferences>true</OptimizeReferences> 142 <OptimizeReferences>true</OptimizeReferences>
93 <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile> 143 <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
94 </Link> 144 </Link>
95 <ResourceCompile> 145 <ResourceCompile>
96 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories> 146 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories>
97 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</Preproces sorDefinitions> 147 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</Preproces sorDefinitions>
98 </ResourceCompile> 148 </ResourceCompile>
99 </ItemDefinitionGroup> 149 </ItemDefinitionGroup>
150 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" >
151 <ClCompile>
152 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories>
153 <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
154 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
155 <IntrinsicFunctions>true</IntrinsicFunctions>
156 <Optimization>MaxSpeed</Optimization>
157 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
158 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
159 <StringPooling>true</StringPooling>
160 </ClCompile>
161 <Link>
162 <AdditionalDependencies>winmm.lib;ws2_32.lib</AdditionalDependencies>
163 <EnableCOMDATFolding>true</EnableCOMDATFolding>
164 <OptimizeReferences>true</OptimizeReferences>
165 <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
166 </Link>
167 <ResourceCompile>
168 <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\goo gletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirector ies)</AdditionalIncludeDirectories>
169 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</Preproces sorDefinitions>
170 </ResourceCompile>
171 </ItemDefinitionGroup>
100 <ItemGroup> 172 <ItemGroup>
101 <None Include="..\libadblockplus.gyp" /> 173 <None Include="..\libadblockplus.gyp" />
102 </ItemGroup> 174 </ItemGroup>
103 <ItemGroup> 175 <ItemGroup>
104 <ClCompile Include="..\test\FilterEngineStubs.cpp" /> 176 <ClCompile Include="..\test\FilterEngineStubs.cpp" />
105 <ClCompile Include="..\test\ConsoleJsObject.cpp" /> 177 <ClCompile Include="..\test\ConsoleJsObject.cpp" />
106 <ClCompile Include="..\test\GlobalJsObject.cpp" /> 178 <ClCompile Include="..\test\GlobalJsObject.cpp" />
107 <ClCompile Include="..\test\Thread.cpp" /> 179 <ClCompile Include="..\test\Thread.cpp" />
108 <ClCompile Include="..\test\JsEngine.cpp" /> 180 <ClCompile Include="..\test\JsEngine.cpp" />
109 </ItemGroup> 181 </ItemGroup>
(...skipping 23 matching lines...) Expand all
133 <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 205 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
134 </ProjectReference> 206 </ProjectReference>
135 <ProjectReference Include="third_party\v8\tools\gyp\js2c.vcxproj"> 207 <ProjectReference Include="third_party\v8\tools\gyp\js2c.vcxproj">
136 <Project>{49135473-EB63-9B96-1382-20C889488A21}</Project> 208 <Project>{49135473-EB63-9B96-1382-20C889488A21}</Project>
137 <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 209 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
138 </ProjectReference> 210 </ProjectReference>
139 </ItemGroup> 211 </ItemGroup>
140 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 212 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
141 <ImportGroup Label="ExtensionTargets" /> 213 <ImportGroup Label="ExtensionTargets" />
142 </Project> 214 </Project>
LEFTRIGHT
« MSVS/libadblockplus.vcxproj ('k') | include/AdblockPlus/FilterEngine.h » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld