Changeset 231677 in webkit

Timestamp:

May 10, 2018 5:06:32 PM (6 years ago)

Author:

rniwa@webkit.org

Message:

build-webkit can erroneously warn about Xcode being too old
​https://bugs.webkit.org/show_bug.cgi?id=185533

Reviewed by Dan Bernstein.

Don't assume the version number is always a single digit.

• Scripts/webkitdirs.pm:

(determineXcodeVersion):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-05-10  Ryosuke Niwa  <rniwa@webkit.org>
+
+        build-webkit can erroneously warn about Xcode being too old
+        https://bugs.webkit.org/show_bug.cgi?id=185533
+
+        Reviewed by Dan Bernstein.
+
+        Don't assume the version number is always a single digit.
+
+        * Scripts/webkitdirs.pm:
+        (determineXcodeVersion):
+
 2018-05-10  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -231 +231 @@
     return if defined $xcodeVersion;
     my $xcodebuildVersionOutput = `xcodebuild -version`;
-    $xcodeVersion = ($xcodebuildVersionOutput =~ /Xcode ([0-9](\.[0-9]+)*)/) ? $1 : "3.0";
+    $xcodeVersion = ($xcodebuildVersionOutput =~ /Xcode ([0-9]+(\.[0-9]+)*)/) ? $1 : "3.0";
 }