From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 5 Jan 2011 12:15:11 +0000
Subject: Merge WebKit at r72805: Initial merge by Git

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
---
 WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops | 46 +++++++++++++----------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to 'WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops')

diff --git a/WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops b/WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops
index 677847d..422c8bd 100644
--- a/WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops
+++ b/WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops
@@ -1,19 +1,27 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="WebKitGUIDCommon"
-	OutputDirectory="$(WebKitOutputDir)\lib"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(WebKitOutputDir)\$(ConfigurationName)\WebKit"
-		PreprocessorDefinitions="_USRDLL;WEBKITGUID_EXPORTS"
-	/>
-  <Tool
-		Name="VCMIDLTool"
-		AdditionalIncludeDirectories="Interfaces"
-		HeaderFileName="$(InputName).h"
-	/>
-
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitGUIDCommon"
+	OutputDirectory="$(WebKitOutputDir)\lib"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="$(WebKitOutputDir)\$(ConfigurationName)\WebKit"
+		PreprocessorDefinitions="_USRDLL;WEBKITGUID_EXPORTS"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+		CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;"
+	/>
+	<Tool
+		Name="VCPreBuildEventTool"
+		CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
+	/>
+  <Tool
+		Name="VCMIDLTool"
+		AdditionalIncludeDirectories="Interfaces"
+		HeaderFileName="$(InputName).h"
+	/>
+
+</VisualStudioPropertySheet>
-- 
cgit v1.1