[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[bfulgham at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 70e539c1d245699668b8dd64cceca70182a33b02
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 21:47:30 2010 +0000

    Unreviewed build fix after vcproj updates.
    
    * DumpRenderTree/win/DumpRenderTreeCairo.vsprops: Make sure
    that WIN_CAIRO is defined for this build.
    * DumpRenderTree/win/DumpRenderTreePreBuild.cmd: Update file
    to reflect new 'Debug_Cairo_CFLite' and 'Release_Cairo_CFLite'
    (these were previously 'Debug_Cairo' and 'Release_Cairo'
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73194 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7b95f63..6c00378 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-02  Brent Fulgham  <bfulgham at webkit.org>
+
+        Unreviewed build fix after vcproj updates.
+
+        * DumpRenderTree/win/DumpRenderTreeCairo.vsprops: Make sure
+        that WIN_CAIRO is defined for this build.
+        * DumpRenderTree/win/DumpRenderTreePreBuild.cmd: Update file
+        to reflect new 'Debug_Cairo_CFLite' and 'Release_Cairo_CFLite'
+        (these were previously 'Debug_Cairo' and 'Release_Cairo'
+
 2010-12-02  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops b/WebKitTools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops
index c4ddf5e..a3af01a 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops
@@ -7,5 +7,6 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\cairo&quot;;"
+		PreprocessorDefinitions="WIN_CAIRO=1"
 	/>
 </VisualStudioPropertySheet>
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTreePreBuild.cmd b/WebKitTools/DumpRenderTree/win/DumpRenderTreePreBuild.cmd
index 540e0aa..1d3fa8b 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTreePreBuild.cmd
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTreePreBuild.cmd
@@ -10,5 +10,9 @@ mkdir 2>NUL "%WEBKITOUTPUTDIR%\include\DumpRenderTree\ForwardingHeaders"
 mkdir 2>NUL "%WEBKITOUTPUTDIR%\include\DumpRenderTree\ForwardingHeaders\wtf"
 
 xcopy /y /d "%PROJECTDIR%\..\ForwardingHeaders\wtf\*.h" "%WEBKITOUTPUTDIR%\include\DumpRenderTree\ForwardingHeaders\wtf"
+
+if "%CONFIGURATIONNAME%"=="Debug_Cairo_CFLite" xcopy /y /d "%WEBKITOUTPUTDIR%\include\WebCore\ForwardingHeaders\wtf\MD5.h" "%WEBKITOUTPUTDIR%\include\DumpRenderTree\ForwardingHeaders\wtf"
+if "%CONFIGURATIONNAME%"=="Release_Cairo_CFLite" xcopy /y /d "%WEBKITOUTPUTDIR%\include\WebCore\ForwardingHeaders\wtf\MD5.h" "%WEBKITOUTPUTDIR%\include\DumpRenderTree\ForwardingHeaders\wtf"
+
 if "%CONFIGURATIONNAME%"=="Debug_Cairo" xcopy /y /d "%TARGETDIR%\..\include\WebCore\ForwardingHeaders\wtf\MD5.h"
 if "%CONFIGURATIONNAME%"=="Release_Cairo" xcopy /y /d "%TARGETDIR%\..\include\WebCore\ForwardingHeaders\wtf\MD5.h"

-- 
WebKit Debian packaging