[webkit-changes] [111547] trunk/Source

Wed, 21 Mar 2012 08:45:47 -0700

Title: [111547] trunk/Source
Revision
111547
Author
[email protected]
Date
2012-03-21 08:45:35 -0700 (Wed, 21 Mar 2012)

Log Message

WTF headers should be in $(ConfigurationBuildDir)\include\private\wtf, not
$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf.
https://bugs.webkit.org/show_bug.cgi?id=81739

Reviewed by Dan Bernstein.

Source/_javascript_Core:

* _javascript_Core.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 _javascript_Core/wtf subdirectory.
* _javascript_Core.vcproj/testRegExp/testRegExp.vcproj:
Ditto.

* _javascript_Core.vcproj/testRegExp/testRegExpReleasePGO.vsprops:
Get the headers for those 4 files from the wtf subdirectory of the build output, not the
_javascript_Core/wtf subdirectory.
* _javascript_Core.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 _javascript_Core/wtf subdirectory.

Source/WTF:

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

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (111546 => 111547)


--- trunk/Source/_javascript_Core/ChangeLog	2012-03-21 15:23:33 UTC (rev 111546)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-03-21 15:45:35 UTC (rev 111547)
@@ -1,3 +1,23 @@
+2012-03-21  Jessie Berlin  <[email protected]>
+
+        WTF headers should be in $(ConfigurationBuildDir)\include\private\wtf, not
+        $(ConfigurationBuildDir)\include\private\_javascript_Core\wtf.
+        https://bugs.webkit.org/show_bug.cgi?id=81739
+
+        Reviewed by Dan Bernstein.
+
+        * _javascript_Core.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 _javascript_Core/wtf subdirectory.
+        * _javascript_Core.vcproj/testRegExp/testRegExp.vcproj:
+        Ditto.
+
+        * _javascript_Core.vcproj/testRegExp/testRegExpReleasePGO.vsprops:
+        Get the headers for those 4 files from the wtf subdirectory of the build output, not the
+        _javascript_Core/wtf subdirectory.
+        * _javascript_Core.vcproj/jsc/jscReleasePGO.vsprops:
+        Ditto.
+
 2012-03-20  Eric Seidel  <[email protected]>
 
         Move wtf/Platform.h from _javascript_Core to Source/WTF/wtf

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jsc.vcproj (111546 => 111547)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jsc.vcproj	2012-03-21 15:23:33 UTC (rev 111546)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jsc.vcproj	2012-03-21 15:45:35 UTC (rev 111547)
@@ -448,7 +448,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\AtomicString.cpp"
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp"
 			>
 		</File>
 		<File
@@ -456,15 +456,15 @@
 			>
 		</File>
 		<File
-			RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringBuilder.cpp"
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp"
 			>
 		</File>
 		<File
-			RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringImpl.cpp"
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp"
 			>
 		</File>
 		<File
-			RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\WTFString.cpp"
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp"
 			>
 		</File>
 	</Files>

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jscReleasePGO.vsprops (111546 => 111547)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jscReleasePGO.vsprops	2012-03-21 15:23:33 UTC (rev 111546)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jscReleasePGO.vsprops	2012-03-21 15:45:35 UTC (rev 111547)
@@ -7,6 +7,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\..\Production\include\private&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\_javascript_Core&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\_javascript_Core\wtf\text&quot;"
+		AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\..\Production\include\private&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\wtf\text&quot;"
 	/>
 </VisualStudioPropertySheet>

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj (111546 => 111547)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj	2012-03-21 15:23:33 UTC (rev 111546)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj	2012-03-21 15:45:35 UTC (rev 111547)
@@ -448,15 +448,15 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\AtomicString.cpp"
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp"
 			>
 		</File>
 		<File
-			RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringBuilder.cpp"
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp"
 			>
 		</File>
 		<File
-			RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringImpl.cpp"
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp"
 			>
 		</File>
 		<File
@@ -464,7 +464,7 @@
 			>
 		</File>
 		<File
-			RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\WTFString.cpp"
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp"
 			>
 		</File>
 	</Files>

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExpReleasePGO.vsprops (111546 => 111547)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExpReleasePGO.vsprops	2012-03-21 15:23:33 UTC (rev 111546)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExpReleasePGO.vsprops	2012-03-21 15:45:35 UTC (rev 111547)
@@ -7,6 +7,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\..\Production\include\private&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\_javascript_Core&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\_javascript_Core\wtf\text&quot;"
+		AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\..\Production\include\private&quot;;&quot;$(ConfigurationBuildDir)\..\Production\include\private\wtf\text&quot;"
 	/>
 </VisualStudioPropertySheet>

Modified: trunk/Source/WTF/ChangeLog (111546 => 111547)


--- trunk/Source/WTF/ChangeLog	2012-03-21 15:23:33 UTC (rev 111546)
+++ trunk/Source/WTF/ChangeLog	2012-03-21 15:45:35 UTC (rev 111547)
@@ -1,3 +1,14 @@
+2012-03-21  Jessie Berlin  <[email protected]>
+
+        WTF headers should be in $(ConfigurationBuildDir)\include\private\wtf, not
+        $(ConfigurationBuildDir)\include\private\_javascript_Core\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/_javascript_Core/wtf.
+
 2012-03-20  Eric Seidel  <[email protected]>
 
         Move wtf/Platform.h from _javascript_Core to Source/WTF/wtf

Modified: trunk/Source/WTF/WTF.vcproj/copy-files.cmd (111546 => 111547)


--- trunk/Source/WTF/WTF.vcproj/copy-files.cmd	2012-03-21 15:23:33 UTC (rev 111546)
+++ trunk/Source/WTF/WTF.vcproj/copy-files.cmd	2012-03-21 15:45:35 UTC (rev 111547)
@@ -1,7 +1,7 @@
 @echo off
 
-set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\_javascript_Core
-set PGOPrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\..\Release_PGO\include\private\_javascript_Core
+set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private
+set PGOPrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\..\Release_PGO\include\private
 
 if "%1" EQU "clean" goto :clean
 if "%1" EQU "rebuild" call :clean

Modified: trunk/Source/WebCore/ChangeLog (111546 => 111547)


--- trunk/Source/WebCore/ChangeLog	2012-03-21 15:23:33 UTC (rev 111546)
+++ trunk/Source/WebCore/ChangeLog	2012-03-21 15:45:35 UTC (rev 111547)
@@ -1,3 +1,15 @@
+2012-03-21  Jessie Berlin  <[email protected]>
+
+        WTF headers should be in $(ConfigurationBuildDir)\include\private\wtf, not
+        $(ConfigurationBuildDir)\include\private\_javascript_Core\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 _javascript_Core/wtf subdirectory.
+
 2012-03-21  Jonathan Dong  <[email protected]>
 
         [BlackBerry] Credential save and autofill implemetation

Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (111546 => 111547)


--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj	2012-03-21 15:23:33 UTC (rev 111546)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj	2012-03-21 15:45:35 UTC (rev 111547)
@@ -71870,15 +71870,15 @@
 			Name="strings"
 			>
 			<File
-				RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\AtomicString.cpp"
+				RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp"
 				>
 			</File>
 			<File
-				RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\StringImpl.cpp"
+				RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="$(ConfigurationBuildDir)\include\private\_javascript_Core\wtf\text\WTFString.cpp"
+				RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp"
 				>
 			</File>
 		</Filter>

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to