[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 14:02:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b90278c59add42dc8125671f11526d266197942e
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 1 18:31:14 2010 +0000
Copy forwarding headers and Inspector JS files as part of WebCoreGenerated.vcproj
WebCoreGenerated.vcproj runs on every build, while WebCore.vcproj only
runs when a .h or .cpp file changes. By moving the copying to
WebCoreGenerated, it will happen even when someone only changes a JS
file (as happened in r68887).
Fixes <http://webkit.org/b/46988> <rdar://problem/8502489> REGRESSION
(r68887): Web Inspector: inspector/extensions*.html are failing on
Windows
Reviewed by Anders Carlsson.
* WebCore.vcproj/WebCore.vcproj: Moved invocation of
copyForwardingHeaders and copyInspectorFiles from here...
* WebCore.vcproj/WebCoreGenerated.vcproj: ...to here.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68905 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 426dda2..390a49c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-10-01 Adam Roben <aroben at apple.com>
+
+ Copy forwarding headers and Inspector JS files as part of
+ WebCoreGenerated.vcproj
+
+ WebCoreGenerated.vcproj runs on every build, while WebCore.vcproj only
+ runs when a .h or .cpp file changes. By moving the copying to
+ WebCoreGenerated, it will happen even when someone only changes a JS
+ file (as happened in r68887).
+
+ Fixes <http://webkit.org/b/46988> <rdar://problem/8502489> REGRESSION
+ (r68887): Web Inspector: inspector/extensions*.html are failing on
+ Windows
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.vcproj/WebCore.vcproj: Moved invocation of
+ copyForwardingHeaders and copyInspectorFiles from here...
+ * WebCore.vcproj/WebCoreGenerated.vcproj: ...to here.
+
2010-09-30 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 2c8d9b4..9155b4d 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -67,7 +67,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd
"
+ CommandLine=""
/>
</Configuration>
<Configuration
@@ -123,7 +123,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd
"
+ CommandLine=""
/>
</Configuration>
<Configuration
@@ -178,7 +178,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd
"
+ CommandLine=""
/>
</Configuration>
<Configuration
@@ -233,7 +233,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd
"
+ CommandLine=""
/>
</Configuration>
<Configuration
@@ -289,7 +289,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd
"
+ CommandLine=""
/>
</Configuration>
<Configuration
@@ -344,7 +344,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd
"
+ CommandLine=""
/>
</Configuration>
</Configurations>
@@ -355,6 +355,10 @@
Name="DerivedSources"
>
<File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\ColorData.cpp"
+ >
+ </File>
+ <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSGrammar.cpp"
>
<FileConfiguration
@@ -423,6 +427,14 @@
>
</File>
<File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSPropertyNames.cpp"
+ >
+ </File>
+ <File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSValueKeywords.cpp"
+ >
+ </File>
+ <File
RelativePath="..\DerivedSources.cpp"
>
<FileConfiguration
@@ -481,6 +493,14 @@
</FileConfiguration>
</File>
<File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\DocTypeStrings.cpp"
+ >
+ </File>
+ <File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\HashTools.h"
+ >
+ </File>
+ <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\HTMLElementFactory.cpp"
>
<FileConfiguration
@@ -545,26 +565,6 @@
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\HashTools.h"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\DocTypeStrings.cpp"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSValueKeywords.cpp"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSPropertyNames.cpp"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\ColorData.cpp"
- >
- </File>
- <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorBackendDispatcher.cpp"
>
</File>
@@ -27412,6 +27412,10 @@
>
</File>
<File
+ RelativePath="..\platform\network\ResourceRawHeaders.h"
+ >
+ </File>
+ <File
RelativePath="..\platform\network\ResourceRequestBase.cpp"
>
</File>
@@ -27428,10 +27432,6 @@
>
</File>
<File
- RelativePath="..\platform\network\ResourceRawHeaders.h"
- >
- </File>
- <File
RelativePath="..\platform\network\SocketStreamErrorBase.cpp"
>
</File>
@@ -33122,7 +33122,7 @@
>
</File>
<File
- RelativePath="..\rendering\svg\RenderSVGTSpan.cpp"
+ RelativePath="..\rendering\svg\RenderSVGText.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -33174,11 +33174,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\rendering\svg\RenderSVGTSpan.h"
+ RelativePath="..\rendering\svg\RenderSVGText.h"
>
</File>
<File
- RelativePath="..\rendering\svg\RenderSVGText.cpp"
+ RelativePath="..\rendering\svg\RenderSVGTextPath.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -33230,11 +33230,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\rendering\svg\RenderSVGText.h"
+ RelativePath="..\rendering\svg\RenderSVGTextPath.h"
>
</File>
<File
- RelativePath="..\rendering\svg\RenderSVGTextPath.cpp"
+ RelativePath="..\rendering\svg\RenderSVGTSpan.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -33286,7 +33286,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\rendering\svg\RenderSVGTextPath.h"
+ RelativePath="..\rendering\svg\RenderSVGTSpan.h"
>
</File>
<File
@@ -37821,6 +37821,14 @@
>
</File>
<File
+ RelativePath="..\html\DOMTokenList.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\html\DOMTokenList.h"
+ >
+ </File>
+ <File
RelativePath="..\html\EmailInputType.cpp"
>
</File>
@@ -37973,27 +37981,27 @@
>
</File>
<File
- RelativePath="..\html\FormDataList.h"
+ RelativePath="..\html\FormDataList.cpp"
>
</File>
<File
- RelativePath="..\html\FTPDirectoryDocument.cpp"
+ RelativePath="..\html\FormDataList.h"
>
</File>
<File
- RelativePath="..\html\DOMTokenList.cpp"
+ RelativePath="..\html\FTPDirectoryDocument.cpp"
>
</File>
<File
- RelativePath="..\html\DOMTokenList.h"
+ RelativePath="..\html\FTPDirectoryDocument.h"
>
</File>
<File
- RelativePath="..\html\FormDataList.cpp"
+ RelativePath="..\html\HiddenInputType.cpp"
>
</File>
<File
- RelativePath="..\html\FTPDirectoryDocument.h"
+ RelativePath="..\html\HiddenInputType.h"
>
</File>
<File
@@ -42345,14 +42353,6 @@
>
</File>
<File
- RelativePath="..\html\HiddenInputType.cpp"
- >
- </File>
- <File
- RelativePath="..\html\HiddenInputType.h"
- >
- </File>
- <File
RelativePath="..\html\ImageData.cpp"
>
</File>
@@ -52996,11 +52996,11 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\GoToLineDialog.js"
+ RelativePath="..\inspector\front-end\goToLineDialog.css"
>
</File>
<File
- RelativePath="..\inspector\front-end\goToLineDialog.css"
+ RelativePath="..\inspector\front-end\GoToLineDialog.js"
>
</File>
<File
@@ -53060,11 +53060,11 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\NetworkPanel.js"
+ RelativePath="..\inspector\front-end\networkPanel.css"
>
</File>
<File
- RelativePath="..\inspector\front-end\networkPanel.css"
+ RelativePath="..\inspector\front-end\NetworkPanel.js"
>
</File>
<File
diff --git a/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj b/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
index 4315c52..4f7dcd9 100644
--- a/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
+++ b/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
@@ -22,8 +22,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="%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 build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" windows
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
- ReBuildCommandLine="echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" windows
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
+ BuildCommandLine="%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 build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" windows
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
+ ReBuildCommandLine="echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" windows
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
CleanCommandLine="del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
Output=""
PreprocessorDefinitions=""
@@ -42,8 +42,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="%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 build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" cairo
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
- ReBuildCommandLine="echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" cairo
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
+ BuildCommandLine="%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 build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" cairo
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
+ ReBuildCommandLine="echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" cairo
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
CleanCommandLine="del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
Output=""
PreprocessorDefinitions=""
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list