Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (110132 => 110133)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-08 03:10:08 UTC (rev 110133)
@@ -1,3 +1,18 @@
+2012-03-07 Jessie Berlin <jber...@apple.com>
+
+ Clean Windows build fails after r110033
+ https://bugs.webkit.org/show_bug.cgi?id=80553
+
+ Rubber-stamped by Jon Honeycutt and Eric Seidel.
+
+ * _javascript_Core.vcproj/_javascript_Core/copy-files.cmd:
+ Place the implementation files next to their header files in the wtf/text subdirectory.
+ Use echo -F to tell xcopy that these are files (since there is apparently no flag).
+ * _javascript_Core.vcproj/jsc/jsc.vcproj:
+ Update the path to those implementation files.
+ * _javascript_Core.vcproj/testRegExp/testRegExp.vcproj:
+ Ditto.
+
2012-03-07 Yuqiang Xian <yuqiang.x...@intel.com>
Eliminate redundant Phis in DFG
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/copy-files.cmd (110132 => 110133)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/copy-files.cmd 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/copy-files.cmd 2012-03-08 03:10:08 UTC (rev 110133)
@@ -77,7 +77,7 @@
wtf\text\StringImpl.cpp
wtf\text\WTFString.cpp
) do (
- xcopy /y /d ..\..\%%f "%PrivateHeadersDirectory%" >NUL
+ echo F | xcopy /y /d ..\..\%%f "%PrivateHeadersDirectory%\%%f" >NUL
)
goto :EOF
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jsc.vcproj (110132 => 110133)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jsc.vcproj 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jsc.vcproj 2012-03-08 03:10:08 UTC (rev 110133)
@@ -448,7 +448,7 @@
</References>
<Files>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\AtomicString.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\AtomicString.cpp"
>
</File>
<File
@@ -456,15 +456,15 @@
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\StringBuilder.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringBuilder.cpp"
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\StringImpl.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringImpl.cpp"
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\WTFString.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\WTFString.cpp"
>
</File>
</Files>
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj (110132 => 110133)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj 2012-03-08 03:10:08 UTC (rev 110133)
@@ -448,15 +448,15 @@
</References>
<Files>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\AtomicString.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\AtomicString.cpp"
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\StringBuilder.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringBuilder.cpp"
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\StringImpl.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringImpl.cpp"
>
</File>
<File
@@ -464,7 +464,7 @@
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\WTFString.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\WTFString.cpp"
>
</File>
</Files>
Modified: trunk/Source/ThirdParty/ChangeLog (110132 => 110133)
--- trunk/Source/ThirdParty/ChangeLog 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Source/ThirdParty/ChangeLog 2012-03-08 03:10:08 UTC (rev 110133)
@@ -1,3 +1,13 @@
+2012-03-07 Jessie Berlin <jber...@apple.com>
+
+ Clean Windows build fails after r110033
+ https://bugs.webkit.org/show_bug.cgi?id=80553
+
+ Rubber-stamped by Jon Honeycutt and Eric Seidel.
+
+ * gtest/msvc/gtest-md.vcproj:
+ Add the new _javascript_Core include directory to the include path.
+
2012-02-21 Sam Weinig <s...@webkit.org>
Attempt to fix the Snow Leopard build.
Modified: trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcproj (110132 => 110133)
--- trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcproj 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcproj 2012-03-08 03:10:08 UTC (rev 110133)
@@ -20,7 +20,7 @@
OutputDirectory="$(ConfigurationBuildDir)\lib"
IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)"
ConfigurationType="4"
- InheritedPropertySheets=""$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops""
+ InheritedPropertySheets="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
CharacterSet="2"
>
<Tool
@@ -40,8 +40,8 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""
Optimization="0"
+ AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\private\_javascript_Core""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -166,8 +166,8 @@
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""
- Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -355,8 +355,8 @@
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""
- Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Modified: trunk/Source/WebCore/ChangeLog (110132 => 110133)
--- trunk/Source/WebCore/ChangeLog 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Source/WebCore/ChangeLog 2012-03-08 03:10:08 UTC (rev 110133)
@@ -1,3 +1,13 @@
+2012-03-07 Jessie Berlin <jber...@apple.com>
+
+ Clean Windows build fails after r110033
+ https://bugs.webkit.org/show_bug.cgi?id=80553
+
+ Rubber-stamped by Jon Honeycutt and Eric Seidel.
+
+ * WebCore.vcproj/WebCore.vcproj:
+ Update the expected location of the copied JSC WTF string implementation files.
+
2012-03-07 Michael Nordman <micha...@google.com>
[Chromium] Don't be so CRASH() happy in the bindings layer.
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (110132 => 110133)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-03-08 03:10:08 UTC (rev 110133)
@@ -24503,7 +24503,7 @@
<File
RelativePath="..\Modules\webdatabase\WorkerContextSQLDatabase.h"
>
- </File>
+ </File>
</Filter>
<Filter
Name="websockets"
@@ -56614,6 +56614,14 @@
Name="html"
>
<File
+ RelativePath="..\fileapi\AsyncFileStream.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\fileapi\AsyncFileStream.h"
+ >
+ </File>
+ <File
RelativePath="..\fileapi\AsyncFileWriter.h"
>
</File>
@@ -56902,14 +56910,6 @@
>
</File>
<File
- RelativePath="..\fileapi\AsyncFileStream.cpp"
- >
- </File>
- <File
- RelativePath="..\fileapi\AsyncFileStream.h"
- >
- </File>
- <File
RelativePath="..\fileapi\EntriesCallback.h"
>
</File>
@@ -71690,15 +71690,15 @@
Name="strings"
>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\AtomicString.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\AtomicString.cpp"
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\StringImpl.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringImpl.cpp"
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\WTFString.cpp"
+ RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\WTFString.cpp"
>
</File>
</Filter>
@@ -73549,11 +73549,11 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\_javascript_Formatter.js"
+ RelativePath="..\inspector\front-end\UglifyJS\_javascript_Formatter.js"
>
</File>
<File
- RelativePath="..\inspector\front-end\UglifyJS\_javascript_Formatter.js"
+ RelativePath="..\inspector\front-end\_javascript_Formatter.js"
>
</File>
<File
Modified: trunk/Tools/ChangeLog (110132 => 110133)
--- trunk/Tools/ChangeLog 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Tools/ChangeLog 2012-03-08 03:10:08 UTC (rev 110133)
@@ -1,3 +1,16 @@
+2012-03-07 Jessie Berlin <jber...@apple.com>
+
+ Clean Windows build fails after r110033
+ https://bugs.webkit.org/show_bug.cgi?id=80553
+
+ Rubber-stamped by Jon Honeycutt and Eric Seidel.
+
+ Add the new _javascript_Core include directory to some more vsprops files.
+
+ * DumpRenderTree/win/ImageDiffCommon.vsprops:
+ * WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops:
+ * WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops:
+
2012-03-07 Rafael Brandao <rafael.l...@openbossa.org>
[NRWT] Fix --platform=qt-5.0 --new-baseline combo
Modified: trunk/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops (110132 => 110133)
--- trunk/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops 2012-03-08 03:10:08 UTC (rev 110133)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private""
+ AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\private\_javascript_Core";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private""
PreprocessorDefinitions="NOMINMAX"
/>
<Tool
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops (110132 => 110133)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops 2012-03-08 03:10:08 UTC (rev 110133)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)\..\InjectedBundle\";"$(ProjectDir)\..\InjectedBundle\Bindings";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\WebCoreTestSupport";"$(WebKitLibrariesDir)\include";"$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\""
+ AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)\..\InjectedBundle\";"$(ProjectDir)\..\InjectedBundle\Bindings";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\WebCoreTestSupport";"$(WebKitLibrariesDir)\include";"$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\""
ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
/>
</VisualStudioPropertySheet>
Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops (110132 => 110133)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops 2012-03-08 03:08:36 UTC (rev 110132)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops 2012-03-08 03:10:08 UTC (rev 110133)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include""
+ AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include""
PreprocessorDefinitions="__WIN32__;_CONSOLE"
DisableSpecificWarnings="4146"
ForcedIncludeFiles="WebKitTestRunnerPrefix.h"