Diff
Modified: trunk/ChangeLog (165219 => 165220)
--- trunk/ChangeLog 2014-03-06 23:06:50 UTC (rev 165219)
+++ trunk/ChangeLog 2014-03-06 23:13:51 UTC (rev 165220)
@@ -1,3 +1,15 @@
+2014-03-06 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r165193.
Modified: trunk/Source/Makefile (165219 => 165220)
--- trunk/Source/Makefile 2014-03-06 23:06:50 UTC (rev 165219)
+++ trunk/Source/Makefile 2014-03-06 23:13:51 UTC (rev 165220)
@@ -1,4 +1,4 @@
-MODULES = WTF _javascript_Core ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
+MODULES = WTF _javascript_Core ThirdParty/ANGLE WebCore WebInspectorUI WebKit2 WebKit
ifneq (,$(findstring iphoneos,$(SDKROOT)))
MODULES = WTF _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
Modified: trunk/Tools/ChangeLog (165219 => 165220)
--- trunk/Tools/ChangeLog 2014-03-06 23:06:50 UTC (rev 165219)
+++ trunk/Tools/ChangeLog 2014-03-06 23:13:51 UTC (rev 165220)
@@ -1,3 +1,14 @@
+2014-03-06 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
make-3.82 fails to build on ARM/Linux
Modified: trunk/Tools/Scripts/build-webkit (165219 => 165220)
--- trunk/Tools/Scripts/build-webkit 2014-03-06 23:06:50 UTC (rev 165219)
+++ trunk/Tools/Scripts/build-webkit 2014-03-06 23:13:51 UTC (rev 165220)
@@ -203,14 +203,17 @@
# 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 @@
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
Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme (165219 => 165220)
--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2014-03-06 23:06:50 UTC (rev 165219)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2014-03-06 23:13:51 UTC (rev 165220)
@@ -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>
Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme (165219 => 165220)
--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2014-03-06 23:06:50 UTC (rev 165219)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2014-03-06 23:13:51 UTC (rev 165220)
@@ -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>
