WTF headers should be in $(ConfigurationBuildDir)\include\private\wtf, not
authorjberlin@webkit.org <jberlin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Mar 2012 15:45:35 +0000 (15:45 +0000)
committerjberlin@webkit.org <jberlin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Mar 2012 15:45:35 +0000 (15:45 +0000)
$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf.
https://bugs.webkit.org/show_bug.cgi?id=81739

Reviewed by Dan Bernstein.

Source/JavaScriptCore:

* JavaScriptCore.vcproj/jsc/jsc.vcproj:
Look for AtomicString.cpp, StringBuilder.cpp, StringImpl.cpp, and WTFString.cpp in the wtf
subdirectory of the build output, not the JavaScriptCore/wtf subdirectory.
* JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj:
Ditto.

* JavaScriptCore.vcproj/testRegExp/testRegExpReleasePGO.vsprops:
Get the headers for those 4 files from the wtf subdirectory of the build output, not the
JavaScriptCore/wtf subdirectory.
* JavaScriptCore.vcproj/jsc/jscReleasePGO.vsprops:
Ditto.

Source/WebCore:

* WebCore.vcproj/WebCore.vcproj:
Look for AtomicString.cpp, StringBuilder.cpp, StringImpl.cpp, and WTFString.cpp in the wtf
subdirectory of the build output, not the JavaScriptCore/wtf subdirectory.

Source/WTF:

* WTF.vcproj/copy-files.cmd:
Copy the headers to private/include/wtf instead of private/include/JavaScriptCore/wtf.

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscReleasePGO.vsprops
Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExpReleasePGO.vsprops
Source/WTF/ChangeLog
Source/WTF/WTF.vcproj/copy-files.cmd
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcproj/WebCore.vcproj

index 53bf20c..efff94d 100644 (file)
@@ -1,3 +1,23 @@
+2012-03-21  Jessie Berlin  <jberlin@apple.com>
+
+        WTF headers should be in $(ConfigurationBuildDir)\include\private\wtf, not
+        $(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf.
+        https://bugs.webkit.org/show_bug.cgi?id=81739
+
+        Reviewed by Dan Bernstein.
+
+        * JavaScriptCore.vcproj/jsc/jsc.vcproj:
+        Look for AtomicString.cpp, StringBuilder.cpp, StringImpl.cpp, and WTFString.cpp in the wtf
+        subdirectory of the build output, not the JavaScriptCore/wtf subdirectory.
+        * JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj:
+        Ditto.
+
+        * JavaScriptCore.vcproj/testRegExp/testRegExpReleasePGO.vsprops:
+        Get the headers for those 4 files from the wtf subdirectory of the build output, not the
+        JavaScriptCore/wtf subdirectory.
+        * JavaScriptCore.vcproj/jsc/jscReleasePGO.vsprops:
+        Ditto.
+
 2012-03-20  Eric Seidel  <eric@webkit.org>
 
         Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
index 21f13fc..9e04fee 100644 (file)
        </References>
        <Files>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\AtomicString.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp"
                        >
                </File>
                <File
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringBuilder.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp"
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringImpl.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp"
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\WTFString.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp"
                        >
                </File>
        </Files>
index 73c4b94..0e4fb84 100644 (file)
@@ -7,6 +7,6 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\..\Production\include\private&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\JavaScriptCore\wtf\text&quot;"
+               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\..\Production\include\private&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\wtf\text&quot;"
        />
 </VisualStudioPropertySheet>
index 6d44dce..b705390 100755 (executable)
        </References>
        <Files>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\AtomicString.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp"
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringBuilder.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp"
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringImpl.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp"
                        >
                </File>
                <File
                        >
                </File>
                <File
-                       RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\WTFString.cpp"
+                       RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp"
                        >
                </File>
        </Files>
index 6c9f7ab..079224b 100755 (executable)
@@ -7,6 +7,6 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\..\Production\include\private&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\JavaScriptCore\wtf\text&quot;"
+               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\..\Production\include\private&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\wtf\text&quot;"
        />
 </VisualStudioPropertySheet>
index 5ca1695..2775f77 100644 (file)
@@ -1,3 +1,14 @@
+2012-03-21  Jessie Berlin  <jberlin@apple.com>
+
+        WTF headers should be in $(ConfigurationBuildDir)\include\private\wtf, not
+        $(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf.
+        https://bugs.webkit.org/show_bug.cgi?id=81739
+
+        Reviewed by Dan Bernstein.
+
+        * WTF.vcproj/copy-files.cmd:
+        Copy the headers to private/include/wtf instead of private/include/JavaScriptCore/wtf.
+
 2012-03-20  Eric Seidel  <eric@webkit.org>
 
         Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
index 5a8f376..21379d1 100755 (executable)
@@ -1,7 +1,7 @@
 @echo off\r
 \r
-set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\JavaScriptCore\r
-set PGOPrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\..\Release_PGO\include\private\JavaScriptCore\r
+set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\r
+set PGOPrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\..\Release_PGO\include\private\r
 \r
 if "%1" EQU "clean" goto :clean\r
 if "%1" EQU "rebuild" call :clean\r
index 5ef9cb7..38d930d 100644 (file)
@@ -1,3 +1,15 @@
+2012-03-21  Jessie Berlin  <jberlin@apple.com>
+
+        WTF headers should be in $(ConfigurationBuildDir)\include\private\wtf, not
+        $(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf.
+        https://bugs.webkit.org/show_bug.cgi?id=81739
+
+        Reviewed by Dan Bernstein.
+
+        * WebCore.vcproj/WebCore.vcproj:
+        Look for AtomicString.cpp, StringBuilder.cpp, StringImpl.cpp, and WTFString.cpp in the wtf
+        subdirectory of the build output, not the JavaScriptCore/wtf subdirectory.
+
 2012-03-21  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
 
         [BlackBerry] Credential save and autofill implemetation
index 20745f7..bd05c3e 100755 (executable)
                        Name="strings"
                        >
                        <File
-                               RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\AtomicString.cpp"
+                               RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringImpl.cpp"
+                               RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\WTFString.cpp"
+                               RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp"
                                >
                        </File>
                </Filter>