Clean Windows build fails after r110033

https://bugs.webkit.org/show_bug.cgi?id=80553

Rubber-stamped by Jon Honeycutt and Eric Seidel.

Source/JavaScriptCore:

* JavaScriptCore.vcproj/JavaScriptCore/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).
* JavaScriptCore.vcproj/jsc/jsc.vcproj:
Update the path to those implementation files.
* JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj:
Ditto.

Source/ThirdParty:

* gtest/msvc/gtest-md.vcproj:
Add the new JavaScriptCore include directory to the include path.

Source/WebCore:

* WebCore.vcproj/WebCore.vcproj:
Update the expected location of the copied JSC WTF string implementation files.

Tools:

Add the new JavaScriptCore include directory to some more vsprops files.

* DumpRenderTree/win/ImageDiffCommon.vsprops:
* WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops:
* WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 10acb940e9448c8490f6f76a3c71debc145f2b9e..18af52ea14cc7fa876c395612cff9709e6585774 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-03-07  Jessie Berlin  <jberlin@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.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/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).
+        * JavaScriptCore.vcproj/jsc/jsc.vcproj:
+        Update the path to those implementation files.
+        * JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj:
+        Ditto.
+
 2012-03-07  Yuqiang Xian  <yuqiang.xian@intel.com>
 
         Eliminate redundant Phis in DFG

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd
index 4431d729fee78affb7ae21d4e3eb1a182ccfbac3..928a37ecbc208b766664507f44ca228016dfd2a1 100755 (executable)
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd
@@ -77,7 +77,7 @@ for %%f in (
     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

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
index a650cd2e5cef380e08a79cbf6e4df9f51d0a21de..21f13fc476a3d9e320876e3c18dfb6042d9118cc 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
@@ -448,7 +448,7 @@
        </References>
        <Files>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\AtomicString.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\AtomicString.cpp"
                        >
                </File>
                <File
@@ -456,15 +456,15 @@
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\StringBuilder.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringBuilder.cpp"
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\StringImpl.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringImpl.cpp"
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\WTFString.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\WTFString.cpp"
                        >
                </File>
        </Files>

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
index b80b059f660d708c5d50d58b15c5de279c882005..6d44dce9114c2bcd8265850a661c5a528669ddad 100755 (executable)
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
@@ -448,15 +448,15 @@
        </References>
        <Files>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\AtomicString.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\AtomicString.cpp"
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\StringBuilder.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringBuilder.cpp"
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\StringImpl.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringImpl.cpp"
                        >
                </File>
                <File
@@ -464,7 +464,7 @@
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\WTFString.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\WTFString.cpp"
                        >
                </File>
        </Files>

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 3e2010833bff01dd0274db54358367f93a8de98f..274a144ab6da3ce281aff66b26e8857325bfd8a8 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-07  Jessie Berlin  <jberlin@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 JavaScriptCore include directory to the include path.
+
 2012-02-21  Sam Weinig  <sam@webkit.org>
 
         Attempt to fix the Snow Leopard build.

diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcproj b/Source/ThirdParty/gtest/msvc/gtest-md.vcproj
index 6c987e9c3a812be4e77f5f50ae3faffc57de2278..7fc23e344bb399501a23d76d0f50ef1fea3d259b 100644 (file)
--- a/Source/ThirdParty/gtest/msvc/gtest-md.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest-md.vcproj
@@ -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="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                Optimization="0"
+                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include\private\JavaScriptCore&quot;"
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -166,8 +166,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                Optimization="0"
+                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -355,8 +355,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                Optimization="0"
+                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b65991699c816b96251e46e7c0790522b7db03e9..fe915ec849173113ae5cacc008dfdb08bd07d804 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-07  Jessie Berlin  <jberlin@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  <michaeln@google.com>
 
         [Chromium] Don't be so CRASH() happy in the bindings layer.

diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
index 6f5b8d2b0b9dc18e60f62b7b827b637a010f39d2..6ac97a52ede4152ab9b0485b11b9e6ca345f960f 100755 (executable)
--- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -24503,7 +24503,7 @@
                                <File
                                        RelativePath="..\Modules\webdatabase\WorkerContextSQLDatabase.h"
                                        >
-                       </File>
+                               </File>
                        </Filter>
                        <Filter
                                Name="websockets"
@@ -56613,6 +56613,14 @@
                <Filter
                        Name="html"
                        >
+                       <File
+                               RelativePath="..\fileapi\AsyncFileStream.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\fileapi\AsyncFileStream.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\fileapi\AsyncFileWriter.h"
                                >
@@ -56901,14 +56909,6 @@
                                RelativePath="..\html\EmailInputType.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\AsyncFileStream.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\AsyncFileStream.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\fileapi\EntriesCallback.h"
                                >
@@ -71690,15 +71690,15 @@
                        Name="strings"
                        >
                        <File
-                               RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\AtomicString.cpp"
+                               RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\AtomicString.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\StringImpl.cpp"
+                               RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringImpl.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\WTFString.cpp"
+                               RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\WTFString.cpp"
                                >
                        </File>
                </Filter>
@@ -73549,11 +73549,11 @@
                                        >
                                </File>
                                <File
-                                       RelativePath="..\inspector\front-end\JavaScriptFormatter.js"
+                                       RelativePath="..\inspector\front-end\UglifyJS\JavaScriptFormatter.js"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\inspector\front-end\UglifyJS\JavaScriptFormatter.js"
+                                       RelativePath="..\inspector\front-end\JavaScriptFormatter.js"
                                        >
                                </File>
                                <File

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b51fe22f2d8ea90ff690e15b33807a2dce10c131..8158db00c9e4579e2a401137346d1d8fcc9c65f3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-07  Jessie Berlin  <jberlin@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 JavaScriptCore 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.lobo@openbossa.org>
 
         [NRWT] Fix --platform=qt-5.0 --new-baseline combo

diff --git a/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops b/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops
index c9464595614cc115113a70789e6bf4c8462391f0..6d6ce55b081c412d1325c59230d231e99ea11d2f 100644 (file)
--- a/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops
+++ b/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops
@@ -6,7 +6,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;"
+               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;"
                PreprocessorDefinitions="NOMINMAX"
        />
        <Tool

diff --git a/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops b/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops
index f870803aafeb9b04ce97f73fece5832dc28fabc5..cfb56400ba5eb6ee7c0917484a8dc3c4b2e1e005 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops
+++ b/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops
@@ -6,7 +6,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\InjectedBundle\&quot;;&quot;$(ProjectDir)\..\InjectedBundle\Bindings&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\WebCoreTestSupport&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\&quot;"
+               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\InjectedBundle\&quot;;&quot;$(ProjectDir)\..\InjectedBundle\Bindings&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(ConfigurationBuildDir)\Include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\WebCoreTestSupport&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\&quot;"
                ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
        />
 </VisualStudioPropertySheet>

diff --git a/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops b/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops
index b8b693696250c35fae0f2a9e1bdbf0ef6423c38e..e7232b05986de689c7852fb3a5ac76eef98d9285 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops
+++ b/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops
@@ -6,7 +6,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;"
+               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(ConfigurationBuildDir)\Include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;"
                PreprocessorDefinitions="__WIN32__;_CONSOLE"
                DisableSpecificWarnings="4146"
                ForcedIncludeFiles="WebKitTestRunnerPrefix.h"