Changeset 161845 in webkit

Timestamp:

Jan 12, 2014, 5:38:07 PM (12 years ago)

Author:

dbates@webkit.org

Message:

[iOS] Fix the build

For now, ensure we build WebKit System Interface before we build WebKit.
We'll remove this constraint and the constraint to build WebKit Additions
in a subsequent commit.

• Scripts/build-webkit:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-01-12  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Fix the build
+
+        For now, ensure we build WebKit System Interface before we build WebKit.
+        We'll remove this constraint and the constraint to build WebKit Additions
+        in a subsequent commit.
+
+        * Scripts/build-webkit:
+
 2014-01-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/build-webkit

@@ -239 +239 @@
 
     if (isIOSWebKit()) {
+        # FIXME: Remove the inclusion of both WebKit System Interface and WebKit Additions projects
+        # once the iOS build is stable.
+
         # WebKitSystemInterface should always be built just before WebKit.
         my $webKitIndex = first { $projects[$_] eq "Source/WebKit" } 0..$#projects;
-        splice(@projects, $webKitIndex, 0, "WebKitSystemInterface");
+        splice(@projects, $webKitIndex, 0, "../Internal/WebKitSystemInterface");
 
         # WebKitAdditions must come before WebCore