[webkit-changes] [148764] tags/Safari-537.38.1/Source

Fri, 19 Apr 2013 13:31:09 -0700

Title: [148764] tags/Safari-537.38.1/Source

Diff

Modified: tags/Safari-537.38.1/Source/_javascript_Core/ChangeLog (148763 => 148764)


--- tags/Safari-537.38.1/Source/_javascript_Core/ChangeLog	2013-04-19 20:30:58 UTC (rev 148763)
+++ tags/Safari-537.38.1/Source/_javascript_Core/ChangeLog	2013-04-19 20:32:55 UTC (rev 148764)
@@ -1,3 +1,13 @@
+2013-04-19  Lucas Forschler  <[email protected]>
+
+        Merge r148760
+
+    2013-04-19  Roger Fong  <[email protected]>
+
+            Unreviewed. WebKit_Source is incorrectly set.
+
+            * _javascript_Core.vcxproj/_javascript_Core.make:
+
 2013-04-17  Mark Lam  <[email protected]>
 
         Avoid using a branch range that is too far for some CPU architectures.

Modified: tags/Safari-537.38.1/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make (148763 => 148764)


--- tags/Safari-537.38.1/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make	2013-04-19 20:30:58 UTC (rev 148763)
+++ tags/Safari-537.38.1/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make	2013-04-19 20:32:55 UTC (rev 148764)
@@ -9,7 +9,7 @@
 	set WebKit_Libraries=$(SRCROOT)\AppleInternal
 	set WebKit_OutputDir=$(OBJROOT)
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-    set WebKit_Source=$(SRCROOT)
+    set WebKit_Source=$(SRCROOT)\..
     -mkdir "%ConfigurationBuildDir%\include\private"
     xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
     devenv "_javascript_Core.submit.sln" /clean $(BUILDSTYLE)

Modified: tags/Safari-537.38.1/Source/WTF/ChangeLog (148763 => 148764)


--- tags/Safari-537.38.1/Source/WTF/ChangeLog	2013-04-19 20:30:58 UTC (rev 148763)
+++ tags/Safari-537.38.1/Source/WTF/ChangeLog	2013-04-19 20:32:55 UTC (rev 148764)
@@ -1,3 +1,13 @@
+2013-04-19  Lucas Forschler  <[email protected]>
+
+        Merge r148760
+
+    2013-04-19  Roger Fong  <[email protected]>
+
+            Unreviewed. WebKit_Source is incorrectly set.
+
+            * WTF.vcxproj/WTF.make:
+
 2013-04-17  Mark Lam  <[email protected]>
 
         Added currentCPUTime() and currentCPUTimeMS().

Modified: tags/Safari-537.38.1/Source/WTF/WTF.vcxproj/WTF.make (148763 => 148764)


--- tags/Safari-537.38.1/Source/WTF/WTF.vcxproj/WTF.make	2013-04-19 20:30:58 UTC (rev 148763)
+++ tags/Safari-537.38.1/Source/WTF/WTF.vcxproj/WTF.make	2013-04-19 20:32:55 UTC (rev 148764)
@@ -8,7 +8,7 @@
     set OFFICIAL_BUILD=1
 	set WebKit_Libraries=$(SRCROOT)\AppleInternal
 	set WebKit_OutputDir=$(OBJROOT)
-    set WebKit_Source=$(SRCROOT)
+    set WebKit_Source=$(SRCROOT)\..
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
     devenv "WTF.submit.sln" /clean $(BUILDSTYLE)
     devenv "WTF.submit.sln" /build $(BUILDSTYLE)

Modified: tags/Safari-537.38.1/Source/WebCore/ChangeLog (148763 => 148764)


--- tags/Safari-537.38.1/Source/WebCore/ChangeLog	2013-04-19 20:30:58 UTC (rev 148763)
+++ tags/Safari-537.38.1/Source/WebCore/ChangeLog	2013-04-19 20:32:55 UTC (rev 148764)
@@ -1,3 +1,13 @@
+2013-04-19  Lucas Forschler  <[email protected]>
+
+        Merge r148760
+
+    2013-04-19  Roger Fong  <[email protected]>
+
+            Unreviewed. WebKit_Source is incorrectly set.
+
+            * WebCore.vcxproj/WebCore.make:
+
 2013-04-17  James Craig  <[email protected]>
 
         AX: aria-level does not override implicit level on h1, h2, etc

Modified: tags/Safari-537.38.1/Source/WebCore/WebCore.vcxproj/WebCore.make (148763 => 148764)


--- tags/Safari-537.38.1/Source/WebCore/WebCore.vcxproj/WebCore.make	2013-04-19 20:30:58 UTC (rev 148763)
+++ tags/Safari-537.38.1/Source/WebCore/WebCore.vcxproj/WebCore.make	2013-04-19 20:32:55 UTC (rev 148764)
@@ -9,7 +9,7 @@
 	set WebKit_Libraries=$(SRCROOT)\AppleInternal
 	set WebKit_OutputDir=$(OBJROOT)
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-    set WebKit_Source=$(SRCROOT)
+    set WebKit_Source=$(SRCROOT)\..
 	-mkdir 2>NUL "%ConfigurationBuildDir%\include\private"
 	xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
 	devenv "WebCore.submit.sln" /rebuild $(BUILDSTYLE)

Modified: tags/Safari-537.38.1/Source/WebKit/ChangeLog (148763 => 148764)


--- tags/Safari-537.38.1/Source/WebKit/ChangeLog	2013-04-19 20:30:58 UTC (rev 148763)
+++ tags/Safari-537.38.1/Source/WebKit/ChangeLog	2013-04-19 20:32:55 UTC (rev 148764)
@@ -1,3 +1,13 @@
+2013-04-19  Lucas Forschler  <[email protected]>
+
+        Merge r148760
+
+    2013-04-19  Roger Fong  <[email protected]>
+
+            Unreviewed. WebKit_Source is incorrectly set.
+
+            * WebKit.vcxproj/WebKit.make:
+
 2013-04-14  Roger Fong  <[email protected]>
 
         Copy make-file-export-generator script to the the Source folders of the projects that use it.

Modified: tags/Safari-537.38.1/Source/WebKit/WebKit.vcxproj/WebKit.make (148763 => 148764)


--- tags/Safari-537.38.1/Source/WebKit/WebKit.vcxproj/WebKit.make	2013-04-19 20:30:58 UTC (rev 148763)
+++ tags/Safari-537.38.1/Source/WebKit/WebKit.vcxproj/WebKit.make	2013-04-19 20:32:55 UTC (rev 148764)
@@ -9,7 +9,7 @@
 	set WebKit_Libraries=$(SRCROOT)\AppleInternal
 	set WebKit_OutputDir=$(OBJROOT)
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-    set WebKit_Source=$(SRCROOT)
+    set WebKit_Source=$(SRCROOT)\..
 	devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)
 	-xcopy "%ConfigurationBuildDir%\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
 	xcopy "%ConfigurationBuildDir%\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y

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

Reply via email to