Title: [174034] trunk
Revision
174034
Author
m...@apple.com
Date
2014-09-27 00:13:44 -0700 (Sat, 27 Sep 2014)

Log Message

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.

Modified Paths

Diff

Modified: trunk/ChangeLog (174033 => 174034)


--- trunk/ChangeLog	2014-09-27 05:18:55 UTC (rev 174033)
+++ trunk/ChangeLog	2014-09-27 07:13:44 UTC (rev 174034)
@@ -1,3 +1,15 @@
+2014-09-27  Dan Bernstein  <m...@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  <cgar...@igalia.com>
 
         [GTK] Enable CSS_IMAGE_SET in production builds

Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme (174033 => 174034)


--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme	2014-09-27 05:18:55 UTC (rev 174033)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme	2014-09-27 07:13:44 UTC (rev 174034)
@@ -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"

Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme (174033 => 174034)


--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme	2014-09-27 05:18:55 UTC (rev 174033)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme	2014-09-27 07:13:44 UTC (rev 174034)
@@ -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"

Modified: trunk/Websites/webkit.org/ChangeLog (174033 => 174034)


--- trunk/Websites/webkit.org/ChangeLog	2014-09-27 05:18:55 UTC (rev 174033)
+++ trunk/Websites/webkit.org/ChangeLog	2014-09-27 07:13:44 UTC (rev 174034)
@@ -1,3 +1,12 @@
+2014-09-27  Dan Bernstein  <m...@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  <a...@apple.com>
 
         WebKit top of tree sources won't build in 10.9 w/ Xcode 6.0.1

Modified: trunk/Websites/webkit.org/building/build.html (174033 => 174034)


--- trunk/Websites/webkit.org/building/build.html	2014-09-27 05:18:55 UTC (rev 174033)
+++ trunk/Websites/webkit.org/building/build.html	2014-09-27 07:13:44 UTC (rev 174034)
@@ -10,7 +10,7 @@
 
 <div class="windows-instructions">
 <h4>Windows</h4>
-<p>Building on Windows requires a few more steps.  For details, see <a href=""
+<p>Building on Windows requires a few more steps. For details, see <a href=""
 </div>
 
 <ol>
@@ -22,8 +22,8 @@
 </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,17 +41,8 @@
 </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>
+<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>
 
-<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>
-
 <?php
     include("../footer.inc");
 ?>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to