WebKit top of tree sources won't build in 10.9 w/ Xcode 6.0.1

https://bugs.webkit.org/show_bug.cgi?id=137053

Reviewed by Mark Rowe.

.:

* WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme:
In the build pre-action, pass the --wksi and --llvm options to
copy-webkitlibraries-to-product-directory.
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme: Ditto.

Websites/webkit.org:

* building/build.html: Removed instructions how to work around this bug, now that it’s fixed.

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

diff --git a/ChangeLog b/ChangeLog
index 85dd18c..6831020 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-09-27  Dan Bernstein  <mitz@apple.com>
+
+        WebKit top of tree sources won't build in 10.9 w/ Xcode 6.0.1
+        https://bugs.webkit.org/show_bug.cgi?id=137053
+
+        Reviewed by Mark Rowe.
+
+        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme:
+        In the build pre-action, pass the --wksi and --llvm options to
+        copy-webkitlibraries-to-product-directory.
+        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme: Ditto.
+
 2014-09-26  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Enable CSS_IMAGE_SET in production builds

diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
index 0b6dbf1..55aadff 100644 (file)
--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
@@ -9,7 +9,7 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "&quot;$SRCROOT/../../Tools/Scripts/copy-webkitlibraries-to-product-directory&quot;">
+               scriptText = "&quot;$SRCROOT/../../Tools/Scripts/copy-webkitlibraries-to-product-directory&quot; --wksi --llvm">
                <EnvironmentBuildable>
                   <BuildableReference
                      BuildableIdentifier = "primary"

diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
index a29ed45..223e88b 100644 (file)
--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
@@ -9,7 +9,7 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "&quot;$SRCROOT/../../Tools/Scripts/copy-webkitlibraries-to-product-directory&quot;">
+               scriptText = "&quot;$SRCROOT/../../Tools/Scripts/copy-webkitlibraries-to-product-directory&quot; --wksi --llvm">
                <EnvironmentBuildable>
                   <BuildableReference
                      BuildableIdentifier = "primary"

diff --git a/Websites/webkit.org/ChangeLog b/Websites/webkit.org/ChangeLog
index 40308d2..1046301 100644 (file)
--- a/Websites/webkit.org/ChangeLog
+++ b/Websites/webkit.org/ChangeLog
@@ -1,3 +1,12 @@
+2014-09-27  Dan Bernstein  <mitz@apple.com>
+
+        WebKit top of tree sources won't build in 10.9 w/ Xcode 6.0.1
+        https://bugs.webkit.org/show_bug.cgi?id=137053
+
+        Reviewed by Mark Rowe.
+
+        * building/build.html: Removed instructions how to work around this bug, now that it’s fixed.
+
 2014-09-26  Alexey Proskuryakov  <ap@apple.com>
 
         WebKit top of tree sources won't build in 10.9 w/ Xcode 6.0.1

diff --git a/Websites/webkit.org/building/build.html b/Websites/webkit.org/building/build.html
index 4fbda8e..2e5704f 100644 (file)
--- a/Websites/webkit.org/building/build.html
+++ b/Websites/webkit.org/building/build.html
@@ -10,7 +10,7 @@ installed</a> and that you have a copy of the <a href="checkout.html">WebKit sou
 
 <div class="windows-instructions">
 <h4>Windows</h4>
-<p>Building on Windows requires a few more steps.  For details, see <a href="http://trac.webkit.org/wiki/BuildingOnWindows">http://trac.webkit.org/wiki/BuildingOnWindows</a>.</p>
+<p>Building on Windows requires a few more steps. For details, see <a href="http://trac.webkit.org/wiki/BuildingOnWindows">http://trac.webkit.org/wiki/BuildingOnWindows</a>.</p>
 </div>
 
 <ol>
@@ -22,8 +22,8 @@ debugging symbols and assertions:</p>
 </li>
 </ol>
 
-<p>By default, <code>build-webkit</code> places build products in <code>WebKitBuild</code>.  You can specify a different build
-location on Mac in your Xcode preferences.  On other platforms, the <code>WEBKIT_OUTPUTDIR</code> environment variable can be used to
+<p>By default, <code>build-webkit</code> places build products in <code>WebKitBuild</code>. You can specify a different build
+location on Mac in your Xcode preferences. On other platforms, the <code>WEBKIT_OUTPUTDIR</code> environment variable can be used to
 set a different build products location. If you have set up a custom build location, then <code>build-webkit</code> will
 place the build products there.</p>
 
@@ -41,16 +41,7 @@ other <a href="/coding/scripts.html">scripts</a>, use the
 </ol>
 
 <h2>Building WebKit from Xcode</h2>
-<p>To build from within Xcode, you can use the WebKit workspace.  Before you build in Xcode:</p>
-
-<ol>
-<li>Build WebKit at least once using the command-line instructions above.  Be sure to build using
-    the same configuration on the command line as you intend to use in Xcode (typically debug).</li>
-<li><p>Ensure that the Products and Intermediates locations for the workspace match those used by <code>build-webkit</code> by choosing File > Workspace Settings. Then click the Advanced button, select Custom, Relative to Workspace, and enter <code>WebKitBuild</code> for both Products and Intermediates.</p>
-    <p>Note that if you have specified a custom build location in Xcode preferences, then you don&rsquo;t need to do this.</p></li>
-<li>If you get unexpected include or linker errors, try deleting the entire WebKitBuild directory, then rebuilding
-    on the command line <b>before</b> you try to build in Xcode.</li>
-</ol>
+<p>To build from within Xcode, you can use the WebKit workspace. Ensure that the Products and Intermediates locations for the workspace match those used by <code>build-webkit</code>: choose File > Workspace Settings, then click the Advanced button, select Custom, Relative to Workspace, and enter <code>WebKitBuild</code> for both Products and Intermediates. Note that if you have specified a custom build location in Xcode preferences, then you don&rsquo;t need to do this.</p>
 
 <?php
     include("../footer.inc");