Skip to site navigation (Press enter)

[webkit-changes] [168731] branches/safari-538.34-branch/Tools

lforschler Tue, 13 May 2014 14:08:44 -0700

Title: [168731] branches/safari-538.34-branch/Tools

Revision: 168731
Author: [email protected]
Date: 2014-05-13 14:07:22 -0700 (Tue, 13 May 2014)

Log Message

Merged r168545.


Modified Paths

branches/safari-538.34-branch/Tools/ChangeLog
branches/safari-538.34-branch/Tools/Scripts/build-webkit

Diff

Modified: branches/safari-538.34-branch/Tools/ChangeLog (168730 => 168731)


--- branches/safari-538.34-branch/Tools/ChangeLog	2014-05-13 21:04:14 UTC (rev 168730)
+++ branches/safari-538.34-branch/Tools/ChangeLog	2014-05-13 21:07:22 UTC (rev 168731)
@@ -1,5 +1,16 @@
 2014-05-13  Lucas Forschler  <[email protected]>
 
+        Merge r168545
+
+    2014-05-09  Anders Carlsson  <[email protected]>
+
+            Follow-up build fix.
+
+            * Scripts/build-webkit:
+            WebKit2 should no longer be built before WebKit.
+
+2014-05-13  Lucas Forschler  <[email protected]>
+
         Merge r168541
 
     2014-05-09  Anders Carlsson  <[email protected]>

Modified: branches/safari-538.34-branch/Tools/Scripts/build-webkit (168730 => 168731)


--- branches/safari-538.34-branch/Tools/Scripts/build-webkit	2014-05-13 21:04:14 UTC (rev 168730)
+++ branches/safari-538.34-branch/Tools/Scripts/build-webkit	2014-05-13 21:07:22 UTC (rev 168731)
@@ -203,10 +203,6 @@
 
         # WebKitAdditions must come before WebCore
         splice(@projects, 0, 0, "../Internal/WebKitAdditions");
-    } else {
-        # WebKit2 should always be built just before WebKit.
-        my $webKitIndex = first { $projects[$_] eq "Source/WebKit" } 0..$#projects;
-        splice(@projects, $webKitIndex, 0, "Source/WebKit2");
     }
 
     # ANGLE must come before WebCore

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