<https://webkit.org/b/90090> build-webkit should verify that your tools are up-to...

Tools:

Enforce a minimum OS version of 10.7.5 and Xcode version of 4.6.

Reviewed by David Kilzer.

* Scripts/webkitdirs.pm:
(checkRequiredSystemConfig):

Websites/webkit.org:

Update references on webkit.org to mention Xcode 4.6 as the minimum version.

Reviewed by David Kilzer.

* building/debug-mac-uiprocess.html:
* building/tools.html:

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a4adbd5..110a01b 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2013-09-20  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/90090> build-webkit should verify that your tools are up-to-date
+
+        Enforce a minimum OS version of 10.7.5 and Xcode version of 4.6.
+
+        Reviewed by David Kilzer.
+
+        * Scripts/webkitdirs.pm:
+        (checkRequiredSystemConfig):
+
 2013-09-20  Mario Sanchez Prada  <mario.prada@samsung.com>
 
         [ATK] Do not expose aria-help in ATK based platforms

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index c092cfb..ff8c3ce 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1505,23 +1505,19 @@ sub checkRequiredSystemConfig
 {
     if (isDarwin()) {
         chomp(my $productVersion = `sw_vers -productVersion`);
-        if (eval "v$productVersion" lt v10.4) {
+        if (eval "v$productVersion" lt v10.7.5) {
             print "*************************************************************\n";
-            print "Mac OS X Version 10.4.0 or later is required to build WebKit.\n";
+            print "Mac OS X Version 10.7.5 or later is required to build WebKit.\n";
             print "You have " . $productVersion . ", thus the build will most likely fail.\n";
             print "*************************************************************\n";
         }
         my $xcodebuildVersionOutput = `xcodebuild -version`;
-        my $devToolsCoreVersion = ($xcodebuildVersionOutput =~ /DevToolsCore-(\d+)/) ? $1 : undef;
         my $xcodeVersion = ($xcodebuildVersionOutput =~ /Xcode ([0-9](\.[0-9]+)*)/) ? $1 : undef;
-        if (!$devToolsCoreVersion && !$xcodeVersion
-            || $devToolsCoreVersion && $devToolsCoreVersion < 747
-            || $xcodeVersion && eval "v$xcodeVersion" lt v2.3) {
+        if (!$xcodeVersion || $xcodeVersion && eval "v$xcodeVersion" lt v4.6) {
             print "*************************************************************\n";
-            print "Xcode Version 2.3 or later is required to build WebKit.\n";
+            print "Xcode Version 4.6 or later is required to build WebKit.\n";
             print "You have an earlier version of Xcode, thus the build will\n";
-            print "most likely fail.  The latest Xcode is available from the web:\n";
-            print "http://developer.apple.com/tools/xcode\n";
+            print "most likely fail. The latest Xcode is available from the App Store.\n";
             print "*************************************************************\n";
         }
     } elsif (isGtk() or isQt() or isEfl()) {

diff --git a/Websites/webkit.org/ChangeLog b/Websites/webkit.org/ChangeLog
index 23f2151..2253000 100644 (file)
--- a/Websites/webkit.org/ChangeLog
+++ b/Websites/webkit.org/ChangeLog
@@ -1,3 +1,14 @@
+2013-09-20  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/90090> build-webkit should verify that your tools are up-to-date
+
+        Update references on webkit.org to mention Xcode 4.6 as the minimum version.
+
+        Reviewed by David Kilzer.
+
+        * building/debug-mac-uiprocess.html:
+        * building/tools.html:
+
 2013-09-19  Dan Bernstein  <mitz@apple.com>
 
         Add a style guideline regarding spacing in range-based for loops

diff --git a/Websites/webkit.org/building/debug-mac-uiprocess.html b/Websites/webkit.org/building/debug-mac-uiprocess.html
index 74d6c64..13a78e7 100644 (file)
--- a/Websites/webkit.org/building/debug-mac-uiprocess.html
+++ b/Websites/webkit.org/building/debug-mac-uiprocess.html
@@ -8,7 +8,7 @@
 <ol>
 <li><p>Open the WebKit2 Xcode project</p></li>
 </ol>
-<p>Note, the Xcode project file depends on the build location specified in the project itself. In Xcode 4.3.2, choose Xcode > Preferences > Locations, click Locations, click the Advanced button, and ensure that the build location is Legacy.</p>
+<p>Note, the Xcode project file depends on the build location specified in the project itself. Choose Xcode > Preferences > Locations, click Locations, click the Advanced button, and ensure that the build location is Legacy.</p>
 <ol start="2">
 <li><p>Set the project's build products location</p>
 <p>To find the WebKit you built, Xcode needs to know the build products location that <code>build-webkit</code> used. You can set the build products location in the project's build settings editor.</p>

diff --git a/Websites/webkit.org/building/tools.html b/Websites/webkit.org/building/tools.html
index 2698fe2..3f256a7 100644 (file)
--- a/Websites/webkit.org/building/tools.html
+++ b/Websites/webkit.org/building/tools.html
@@ -7,11 +7,10 @@ include("../header.inc");
 <h4>Mac OS X</h4>
 <ol>
 <li><p>Install Xcode</p>
-<p>Get Xcode from <a target="installtools" href="https://developer.apple.com/downloads">https://developer.apple.com/downloads</a>.  Xcode 3.1.4 or later is required to build.</p>
+<p>Get Xcode from <a target="installtools" href="https://developer.apple.com/downloads">https://developer.apple.com/downloads</a>. Xcode 4.6 or later is required to build.</p>
 <li><p>Install the Xcode Command Line Tools (located under Xcode Preferences > Downloads)</p>
-  <p><b>Note:</b> Before you can use the Xcode 4.3.2 tools, you must either run <code>sudo xcode-select -switch /Applications/Xcode.app</code> or
+  <p><b>Note:</b> Before you can use the command line tools, you must either run <code>sudo xcode-select -switch /Applications/Xcode.app</code> or
 set the environment variable DEVELOPER_DIR to <code>/Applications/Xcode.app/Contents/Developer</code>. See <a href="x-man-page://xcode-select">the <code>xcode-select</code> man page</a> for more details.</p>
-  <p><b>Note:</b> This step is not required for versions of Xcode earlier than 4.3.</p>
 <li><p>Install Java for Mac OS X Developer Package</p>
 <p>Download and install the latest OS-appropriate &ldquo;Java for Mac OS X Developer Package&rdquo; from <a target="installtools" href="https://developer.apple.com/downloads">https://developer.apple.com/downloads</a>.</p>
 </ol>