Changeset 63830 in webkit
- Timestamp:
- Jul 21, 2010 9:01:51 AM (14 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r63825 r63830 1 2010-07-21 Adam Roben <aroben@apple.com> 2 3 Move WebKit2WebProcess's settings to a vsprops file 4 5 Fixes <http://webkit.org/b/42751> WebKit2WebProcess should use vsprops 6 files 7 8 Reviewed by Darin Adler. 9 10 * win/WebKit2WebProcess.vcproj: Moved settings from here... 11 * win/WebKit2WebProcessCommon.vsprops: ...to here. 12 1 13 2010-07-20 Ivan Krstić <ike@apple.com> 2 14 -
trunk/WebKit2/win/WebKit2WebProcess.vcproj
r63438 r63830 18 18 Name="Debug|Win32" 19 19 ConfigurationType="1" 20 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops" 21 CharacterSet="1" 22 > 23 <Tool 24 Name="VCPreBuildEventTool" 25 CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

bash "$(WebKitLibrariesDir)\tools\scripts\auto-version.sh" "$(IntDir)"
" 26 /> 27 <Tool 28 Name="VCCustomBuildTool" 29 /> 30 <Tool 31 Name="VCXMLDataGeneratorTool" 32 /> 33 <Tool 34 Name="VCWebServiceProxyGeneratorTool" 35 /> 36 <Tool 37 Name="VCMIDLTool" 38 /> 39 <Tool 40 Name="VCCLCompilerTool" 41 AdditionalIncludeDirectories=""$(ProjectDir)\..\WebProcess\win"" 42 /> 43 <Tool 44 Name="VCManagedResourceCompilerTool" 45 /> 46 <Tool 47 Name="VCResourceCompilerTool" 48 /> 49 <Tool 50 Name="VCPreLinkEventTool" 51 /> 52 <Tool 53 Name="VCLinkerTool" 54 AdditionalOptions="/NXCOMPAT" 55 AdditionalDependencies="WebKit$(WebKitDLLConfigSuffix).lib" 56 /> 57 <Tool 58 Name="VCALinkTool" 59 /> 60 <Tool 61 Name="VCManifestTool" 62 /> 63 <Tool 64 Name="VCXDCMakeTool" 65 /> 66 <Tool 67 Name="VCBscMakeTool" 68 /> 69 <Tool 70 Name="VCFxCopTool" 71 /> 72 <Tool 73 Name="VCAppVerifierTool" 74 /> 75 <Tool 76 Name="VCWebDeploymentTool" 77 /> 78 <Tool 79 Name="VCPostBuildEventTool" 80 CommandLine="if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 20 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;.\WebKit2WebProcessCommon.vsprops" 21 CharacterSet="1" 22 > 23 <Tool 24 Name="VCPreBuildEventTool" 25 CommandLine="" 26 /> 27 <Tool 28 Name="VCCustomBuildTool" 29 /> 30 <Tool 31 Name="VCXMLDataGeneratorTool" 32 /> 33 <Tool 34 Name="VCWebServiceProxyGeneratorTool" 35 /> 36 <Tool 37 Name="VCMIDLTool" 38 /> 39 <Tool 40 Name="VCCLCompilerTool" 41 AdditionalIncludeDirectories="" 42 /> 43 <Tool 44 Name="VCManagedResourceCompilerTool" 45 /> 46 <Tool 47 Name="VCResourceCompilerTool" 48 /> 49 <Tool 50 Name="VCPreLinkEventTool" 51 /> 52 <Tool 53 Name="VCLinkerTool" 54 AdditionalOptions="/NXCOMPAT" 55 /> 56 <Tool 57 Name="VCALinkTool" 58 /> 59 <Tool 60 Name="VCManifestTool" 61 /> 62 <Tool 63 Name="VCXDCMakeTool" 64 /> 65 <Tool 66 Name="VCBscMakeTool" 67 /> 68 <Tool 69 Name="VCFxCopTool" 70 /> 71 <Tool 72 Name="VCAppVerifierTool" 73 /> 74 <Tool 75 Name="VCWebDeploymentTool" 76 /> 77 <Tool 78 Name="VCPostBuildEventTool" 79 CommandLine="" 81 80 /> 82 81 </Configuration> … … 84 83 Name="Release|Win32" 85 84 ConfigurationType="1" 86 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops "85 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\WebKit2WebProcessCommon.vsprops" 87 86 CharacterSet="1" 88 87 WholeProgramOptimization="1" … … 90 89 <Tool 91 90 Name="VCPreBuildEventTool" 92 CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

bash "$(WebKitLibrariesDir)\tools\scripts\auto-version.sh" "$(IntDir)"
" 93 /> 94 <Tool 95 Name="VCCustomBuildTool" 96 /> 97 <Tool 98 Name="VCXMLDataGeneratorTool" 99 /> 100 <Tool 101 Name="VCWebServiceProxyGeneratorTool" 102 /> 103 <Tool 104 Name="VCMIDLTool" 105 /> 106 <Tool 107 Name="VCCLCompilerTool" 108 AdditionalIncludeDirectories=""$(ProjectDir)\..\WebProcess\win"" 109 /> 110 <Tool 111 Name="VCManagedResourceCompilerTool" 112 /> 113 <Tool 114 Name="VCResourceCompilerTool" 115 /> 116 <Tool 117 Name="VCPreLinkEventTool" 118 /> 119 <Tool 120 Name="VCLinkerTool" 121 AdditionalOptions="/NXCOMPAT" 122 AdditionalDependencies="WebKit$(WebKitDLLConfigSuffix).lib" 123 /> 124 <Tool 125 Name="VCALinkTool" 126 /> 127 <Tool 128 Name="VCManifestTool" 129 /> 130 <Tool 131 Name="VCXDCMakeTool" 132 /> 133 <Tool 134 Name="VCBscMakeTool" 135 /> 136 <Tool 137 Name="VCFxCopTool" 138 /> 139 <Tool 140 Name="VCAppVerifierTool" 141 /> 142 <Tool 143 Name="VCWebDeploymentTool" 144 /> 145 <Tool 146 Name="VCPostBuildEventTool" 147 CommandLine="if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 91 CommandLine="" 92 /> 93 <Tool 94 Name="VCCustomBuildTool" 95 /> 96 <Tool 97 Name="VCXMLDataGeneratorTool" 98 /> 99 <Tool 100 Name="VCWebServiceProxyGeneratorTool" 101 /> 102 <Tool 103 Name="VCMIDLTool" 104 /> 105 <Tool 106 Name="VCCLCompilerTool" 107 AdditionalIncludeDirectories="" 108 /> 109 <Tool 110 Name="VCManagedResourceCompilerTool" 111 /> 112 <Tool 113 Name="VCResourceCompilerTool" 114 /> 115 <Tool 116 Name="VCPreLinkEventTool" 117 /> 118 <Tool 119 Name="VCLinkerTool" 120 AdditionalOptions="/NXCOMPAT" 121 /> 122 <Tool 123 Name="VCALinkTool" 124 /> 125 <Tool 126 Name="VCManifestTool" 127 /> 128 <Tool 129 Name="VCXDCMakeTool" 130 /> 131 <Tool 132 Name="VCBscMakeTool" 133 /> 134 <Tool 135 Name="VCFxCopTool" 136 /> 137 <Tool 138 Name="VCAppVerifierTool" 139 /> 140 <Tool 141 Name="VCWebDeploymentTool" 142 /> 143 <Tool 144 Name="VCPostBuildEventTool" 145 CommandLine="" 148 146 /> 149 147 </Configuration> … … 151 149 Name="Debug_All|Win32" 152 150 ConfigurationType="1" 153 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops" 154 CharacterSet="1" 155 > 156 <Tool 157 Name="VCPreBuildEventTool" 158 CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

bash "$(WebKitLibrariesDir)\tools\scripts\auto-version.sh" "$(IntDir)"
" 159 /> 160 <Tool 161 Name="VCCustomBuildTool" 162 /> 163 <Tool 164 Name="VCXMLDataGeneratorTool" 165 /> 166 <Tool 167 Name="VCWebServiceProxyGeneratorTool" 168 /> 169 <Tool 170 Name="VCMIDLTool" 171 /> 172 <Tool 173 Name="VCCLCompilerTool" 174 AdditionalIncludeDirectories=""$(ProjectDir)\..\WebProcess\win"" 175 /> 176 <Tool 177 Name="VCManagedResourceCompilerTool" 178 /> 179 <Tool 180 Name="VCResourceCompilerTool" 181 /> 182 <Tool 183 Name="VCPreLinkEventTool" 184 /> 185 <Tool 186 Name="VCLinkerTool" 187 AdditionalOptions="/NXCOMPAT" 188 AdditionalDependencies="WebKit$(WebKitDLLConfigSuffix).lib" 189 /> 190 <Tool 191 Name="VCALinkTool" 192 /> 193 <Tool 194 Name="VCManifestTool" 195 /> 196 <Tool 197 Name="VCXDCMakeTool" 198 /> 199 <Tool 200 Name="VCBscMakeTool" 201 /> 202 <Tool 203 Name="VCFxCopTool" 204 /> 205 <Tool 206 Name="VCAppVerifierTool" 207 /> 208 <Tool 209 Name="VCWebDeploymentTool" 210 /> 211 <Tool 212 Name="VCPostBuildEventTool" 213 CommandLine="if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 151 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops;.\WebKit2WebProcessCommon.vsprops" 152 CharacterSet="1" 153 > 154 <Tool 155 Name="VCPreBuildEventTool" 156 CommandLine="" 157 /> 158 <Tool 159 Name="VCCustomBuildTool" 160 /> 161 <Tool 162 Name="VCXMLDataGeneratorTool" 163 /> 164 <Tool 165 Name="VCWebServiceProxyGeneratorTool" 166 /> 167 <Tool 168 Name="VCMIDLTool" 169 /> 170 <Tool 171 Name="VCCLCompilerTool" 172 AdditionalIncludeDirectories="" 173 /> 174 <Tool 175 Name="VCManagedResourceCompilerTool" 176 /> 177 <Tool 178 Name="VCResourceCompilerTool" 179 /> 180 <Tool 181 Name="VCPreLinkEventTool" 182 /> 183 <Tool 184 Name="VCLinkerTool" 185 AdditionalOptions="/NXCOMPAT" 186 /> 187 <Tool 188 Name="VCALinkTool" 189 /> 190 <Tool 191 Name="VCManifestTool" 192 /> 193 <Tool 194 Name="VCXDCMakeTool" 195 /> 196 <Tool 197 Name="VCBscMakeTool" 198 /> 199 <Tool 200 Name="VCFxCopTool" 201 /> 202 <Tool 203 Name="VCAppVerifierTool" 204 /> 205 <Tool 206 Name="VCWebDeploymentTool" 207 /> 208 <Tool 209 Name="VCPostBuildEventTool" 210 CommandLine="" 214 211 /> 215 212 </Configuration> … … 217 214 Name="Debug_Internal|Win32" 218 215 ConfigurationType="1" 219 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops" 220 CharacterSet="1" 221 > 222 <Tool 223 Name="VCPreBuildEventTool" 224 CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

bash "$(WebKitLibrariesDir)\tools\scripts\auto-version.sh" "$(IntDir)"
" 225 /> 226 <Tool 227 Name="VCCustomBuildTool" 228 /> 229 <Tool 230 Name="VCXMLDataGeneratorTool" 231 /> 232 <Tool 233 Name="VCWebServiceProxyGeneratorTool" 234 /> 235 <Tool 236 Name="VCMIDLTool" 237 /> 238 <Tool 239 Name="VCCLCompilerTool" 240 AdditionalIncludeDirectories=""$(ProjectDir)\..\WebProcess\win"" 241 /> 242 <Tool 243 Name="VCManagedResourceCompilerTool" 244 /> 245 <Tool 246 Name="VCResourceCompilerTool" 247 /> 248 <Tool 249 Name="VCPreLinkEventTool" 250 /> 251 <Tool 252 Name="VCLinkerTool" 253 AdditionalOptions="/NXCOMPAT" 254 AdditionalDependencies="WebKit$(WebKitDLLConfigSuffix).lib" 255 /> 256 <Tool 257 Name="VCALinkTool" 258 /> 259 <Tool 260 Name="VCManifestTool" 261 /> 262 <Tool 263 Name="VCXDCMakeTool" 264 /> 265 <Tool 266 Name="VCBscMakeTool" 267 /> 268 <Tool 269 Name="VCFxCopTool" 270 /> 271 <Tool 272 Name="VCAppVerifierTool" 273 /> 274 <Tool 275 Name="VCWebDeploymentTool" 276 /> 277 <Tool 278 Name="VCPostBuildEventTool" 279 CommandLine="if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 216 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;.\WebKit2WebProcessCommon.vsprops" 217 CharacterSet="1" 218 > 219 <Tool 220 Name="VCPreBuildEventTool" 221 CommandLine="" 222 /> 223 <Tool 224 Name="VCCustomBuildTool" 225 /> 226 <Tool 227 Name="VCXMLDataGeneratorTool" 228 /> 229 <Tool 230 Name="VCWebServiceProxyGeneratorTool" 231 /> 232 <Tool 233 Name="VCMIDLTool" 234 /> 235 <Tool 236 Name="VCCLCompilerTool" 237 AdditionalIncludeDirectories="" 238 /> 239 <Tool 240 Name="VCManagedResourceCompilerTool" 241 /> 242 <Tool 243 Name="VCResourceCompilerTool" 244 /> 245 <Tool 246 Name="VCPreLinkEventTool" 247 /> 248 <Tool 249 Name="VCLinkerTool" 250 AdditionalOptions="/NXCOMPAT" 251 /> 252 <Tool 253 Name="VCALinkTool" 254 /> 255 <Tool 256 Name="VCManifestTool" 257 /> 258 <Tool 259 Name="VCXDCMakeTool" 260 /> 261 <Tool 262 Name="VCBscMakeTool" 263 /> 264 <Tool 265 Name="VCFxCopTool" 266 /> 267 <Tool 268 Name="VCAppVerifierTool" 269 /> 270 <Tool 271 Name="VCWebDeploymentTool" 272 /> 273 <Tool 274 Name="VCPostBuildEventTool" 275 CommandLine="" 280 276 /> 281 277 </Configuration> … … 285 281 IntermediateDirectory="$(ConfigurationName)" 286 282 ConfigurationType="1" 287 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_wincairo.vsprops" 288 CharacterSet="1" 289 > 290 <Tool 291 Name="VCPreBuildEventTool" 292 CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

bash "$(WebKitLibrariesDir)\tools\scripts\auto-version.sh" "$(IntDir)"
" 293 /> 294 <Tool 295 Name="VCCustomBuildTool" 296 /> 297 <Tool 298 Name="VCXMLDataGeneratorTool" 299 /> 300 <Tool 301 Name="VCWebServiceProxyGeneratorTool" 302 /> 303 <Tool 304 Name="VCMIDLTool" 305 /> 306 <Tool 307 Name="VCCLCompilerTool" 308 AdditionalIncludeDirectories=""$(ProjectDir)\..\WebProcess\win"" 309 /> 310 <Tool 311 Name="VCManagedResourceCompilerTool" 312 /> 313 <Tool 314 Name="VCResourceCompilerTool" 315 /> 316 <Tool 317 Name="VCPreLinkEventTool" 318 /> 319 <Tool 320 Name="VCLinkerTool" 321 AdditionalOptions="/NXCOMPAT" 322 AdditionalDependencies="WebKit$(WebKitDLLConfigSuffix).lib" 323 /> 324 <Tool 325 Name="VCALinkTool" 326 /> 327 <Tool 328 Name="VCManifestTool" 329 /> 330 <Tool 331 Name="VCXDCMakeTool" 332 /> 333 <Tool 334 Name="VCBscMakeTool" 335 /> 336 <Tool 337 Name="VCFxCopTool" 338 /> 339 <Tool 340 Name="VCAppVerifierTool" 341 /> 342 <Tool 343 Name="VCWebDeploymentTool" 344 /> 345 <Tool 346 Name="VCPostBuildEventTool" 347 CommandLine="if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 283 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_wincairo.vsprops;.\WebKit2WebProcessCommon.vsprops" 284 CharacterSet="1" 285 > 286 <Tool 287 Name="VCPreBuildEventTool" 288 CommandLine="" 289 /> 290 <Tool 291 Name="VCCustomBuildTool" 292 /> 293 <Tool 294 Name="VCXMLDataGeneratorTool" 295 /> 296 <Tool 297 Name="VCWebServiceProxyGeneratorTool" 298 /> 299 <Tool 300 Name="VCMIDLTool" 301 /> 302 <Tool 303 Name="VCCLCompilerTool" 304 AdditionalIncludeDirectories="" 305 /> 306 <Tool 307 Name="VCManagedResourceCompilerTool" 308 /> 309 <Tool 310 Name="VCResourceCompilerTool" 311 /> 312 <Tool 313 Name="VCPreLinkEventTool" 314 /> 315 <Tool 316 Name="VCLinkerTool" 317 AdditionalOptions="/NXCOMPAT" 318 /> 319 <Tool 320 Name="VCALinkTool" 321 /> 322 <Tool 323 Name="VCManifestTool" 324 /> 325 <Tool 326 Name="VCXDCMakeTool" 327 /> 328 <Tool 329 Name="VCBscMakeTool" 330 /> 331 <Tool 332 Name="VCFxCopTool" 333 /> 334 <Tool 335 Name="VCAppVerifierTool" 336 /> 337 <Tool 338 Name="VCWebDeploymentTool" 339 /> 340 <Tool 341 Name="VCPostBuildEventTool" 342 CommandLine="" 348 343 /> 349 344 </Configuration>
Note: See TracChangeset
for help on using the changeset viewer.