Build WebKit2 before building WebKit

https://bugs.webkit.org/show_bug.cgi?id=129831
<rdar://problem/15920020>

Reviewed by Dan Bernstein.

.:

* Source/Makefile:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:

Tools:

* Scripts/build-webkit:
Always build WebKit2 and make sure to build it before WebKit when building on Mac.

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

diff --git a/ChangeLog b/ChangeLog
index b0677bb8f878f2b73bd8082b7b05d81c8560b978..5e0a0b8487aacea8d5f41e0e4d7f54317135ceff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-03-06  Anders Carlsson  <andersca@apple.com>
+
+        Build WebKit2 before building WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=129831
+        <rdar://problem/15920020>
+
+        Reviewed by Dan Bernstein.
+
+        * Source/Makefile:
+        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme:
+        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+
 2014-03-06  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r165193.

diff --git a/Source/Makefile b/Source/Makefile
index 530cc7d5094e04ca258839147203630f2da3c5ba..9c6ffd3a822c917d86dcc5f0ee6eb568fcd6ab61 100644 (file)
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -1,4 +1,4 @@
-MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
+MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit2 WebKit
 
 ifneq (,$(findstring iphoneos,$(SDKROOT)))
        MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 30acb1bb790643e35772a0aa2eaa728678a7fcce..fc4ee32f684da6de498e70b822784cd7d79c71c1 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-06  Anders Carlsson  <andersca@apple.com>
+
+        Build WebKit2 before building WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=129831
+        <rdar://problem/15920020>
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/build-webkit:
+        Always build WebKit2 and make sure to build it before WebKit when building on Mac.
+
 2014-03-06  ChangSeok Oh  <changseok.oh@collabora.com>
 
         make-3.82 fails to build on ARM/Linux

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index df1b5e0a8bc445a85466aa023ff81e9bda164037..388627a2522607ef13dd62740d49fd28a5ab4178 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -203,14 +203,17 @@ if (isAppleMacWebKit()) {
 
         # 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
     splice @projects, 0, 0, "Source/ThirdParty/ANGLE";
 
     if (!isIOSWebKit()) {
-        # WebKit2 is only supported in SnowLeopard and later at present.
-        push @projects, ("Source/WebKit2", "Tools/MiniBrowser") if osXVersion()->{"minor"} >= 6 and !$noWebKit2;
+        push @projects, ("Tools/MiniBrowser");
 
         # WebInspectorUI must come before WebKit and WebKit2
         unshift @projects, ("Source/WebInspectorUI");
@@ -224,7 +227,7 @@ if (isAppleMacWebKit()) {
         print(join(" ", @copyLibrariesArgs) . "\n");
         (system(@copyLibrariesArgs) == 0) or die;
     } else {
-        push @projects, ("Source/WebKit2") if !$noWebKit2;
+        push @projects, ("Source/WebKit2");
     }
 
     # Build Tools needed for Apple ports

diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
index 72d60effb9bbba0520e520ec3c1aa43f348c6997..ef75029eb573e494593d2f1c6d9019e8a7877a37 100644 (file)
--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
@@ -87,10 +87,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9398100A0824BF01008DF038"
-               BuildableName = "WebKit.framework"
-               BlueprintName = "WebKit"
-               ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
+               BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
+               BuildableName = "All"
+               BlueprintName = "All"
+               ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -101,10 +101,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
-               BuildableName = "All"
-               BlueprintName = "All"
-               ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
+               BlueprintIdentifier = "9398100A0824BF01008DF038"
+               BuildableName = "WebKit.framework"
+               BlueprintName = "WebKit"
+               ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>

diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
index fd2cca7ebda8ede8f0a66389925caf5c0e425fb4..5b60fab522894eb69c0508bbb33910a5e3dde041 100644 (file)
--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
@@ -87,10 +87,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9398100A0824BF01008DF038"
-               BuildableName = "WebKit.framework"
-               BlueprintName = "WebKit"
-               ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
+               BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
+               BuildableName = "All"
+               BlueprintName = "All"
+               ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -101,10 +101,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
-               BuildableName = "All"
-               BlueprintName = "All"
-               ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
+               BlueprintIdentifier = "9398100A0824BF01008DF038"
+               BuildableName = "WebKit.framework"
+               BlueprintName = "WebKit"
+               ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>