diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /Tools/TestWebKitAPI | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'Tools/TestWebKitAPI')
6 files changed, 15 insertions, 14 deletions
diff --git a/Tools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops b/Tools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops index 43927f2..6742ff1 100644 --- a/Tools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops +++ b/Tools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops @@ -6,7 +6,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\include\private";"$(WebKitLibrariesDir)\include"" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..";"$(ConfigurationBuildDir)\include";"$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private";"$(WebKitLibrariesDir)\include"" ForcedIncludeFiles="TestWebKitAPIPrefix.h" /> <Tool diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj b/Tools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj index 3f30a05..d52560a 100644 --- a/Tools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj +++ b/Tools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj @@ -17,7 +17,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="0" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops" + InheritedPropertySheets=".\TestWebKitAPIGeneratedCommon.vsprops" > <Tool Name="VCNMakeTool" @@ -26,7 +26,7 @@ <Configuration Name="Release|Win32" ConfigurationType="0" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops" + InheritedPropertySheets=".\TestWebKitAPIGeneratedCommon.vsprops" > <Tool Name="VCNMakeTool" @@ -35,7 +35,7 @@ <Configuration Name="Debug_All|Win32" ConfigurationType="0" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops" + InheritedPropertySheets=".\TestWebKitAPIGeneratedCommon.vsprops" > <Tool Name="VCNMakeTool" @@ -44,7 +44,7 @@ <Configuration Name="Release_LTCG|Win32" ConfigurationType="0" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops" + InheritedPropertySheets=".\TestWebKitAPIGeneratedCommon.vsprops" > <Tool Name="VCNMakeTool" @@ -53,7 +53,7 @@ <Configuration Name="Release_Cairo_CFLite|Win32" ConfigurationType="0" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops" + InheritedPropertySheets=".\TestWebKitAPIGeneratedCommon.vsprops" > <Tool Name="VCNMakeTool" @@ -62,7 +62,7 @@ <Configuration Name="Debug_Cairo_CFLite|Win32" ConfigurationType="0" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops" + InheritedPropertySheets=".\TestWebKitAPIGeneratedCommon.vsprops" > <Tool Name="VCNMakeTool" diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops b/Tools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops index 7e1587b..00348cb 100644 --- a/Tools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops +++ b/Tools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops @@ -3,11 +3,12 @@ ProjectType="Visual C++" Version="8.00" Name="TestWebKitAPIGeneratedCommon" + InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops" > <Tool Name="VCNMakeTool" - BuildCommandLine="copy-resources.cmd" - ReBuildCommandLine="copy-resources.cmd rebuild" - CleanCommandLine="copy-resources.cmd clean" + BuildCommandLine="set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
copy-resources.cmd" + ReBuildCommandLine="set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
copy-resources.cmd rebuild" + CleanCommandLine="set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
copy-resources.cmd clean" /> </VisualStudioPropertySheet> diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd b/Tools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd index f011495..26707ca 100644 --- a/Tools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd +++ b/Tools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd @@ -1 +1 @@ -if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed" +if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed" diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd b/Tools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd index 3a84c26..a770776 100644 --- a/Tools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd +++ b/Tools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd @@ -1,6 +1,6 @@ %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 exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed" if errorlevel 1 exit 1 -echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed" +echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed" diff --git a/Tools/TestWebKitAPI/win/copy-resources.cmd b/Tools/TestWebKitAPI/win/copy-resources.cmd index 4b209d4..dc56479 100755 --- a/Tools/TestWebKitAPI/win/copy-resources.cmd +++ b/Tools/TestWebKitAPI/win/copy-resources.cmd @@ -1,6 +1,6 @@ @echo off -set ResourcesDirectory=%WebKitOutputDir%\bin\TestWebKitAPI.resources +set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin\TestWebKitAPI.resources if "%1" EQU "clean" goto :clean if "%1" EQU "rebuild" call :clean |