Changeset 90439 in webkit

Timestamp:

Jul 5, 2011 11:55:09 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-07-05 Eric Seidel <​eric@webkit.org>

Perl string concat failure on Leopard (causes NRWT to fail)
​https://bugs.webkit.org/show_bug.cgi?id=63973

Reviewed by Daniel Bates.

Leopard's "xcodebuild -version" has a different format from Snow Leopard/Lion
thus the version parsing logic in webkitdirs.pm seems to fail.

Default to "3.0" instead of undef when we can't parse the version number.
This should send us down the correct path for Leopard.

• Scripts/webkitdirs.pm: (determineBaseProductDir):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-05  Eric Seidel  <eric@webkit.org>
+
+        Perl string concat failure on Leopard (causes NRWT to fail)
+        https://bugs.webkit.org/show_bug.cgi?id=63973
+
+        Reviewed by Daniel Bates.
+
+        Leopard's "xcodebuild -version" has a different format from Snow Leopard/Lion
+        thus the version parsing logic in webkitdirs.pm seems to fail.
+
+        Default to "3.0" instead of undef when we can't parse the version number.
+        This should send us down the correct path for Leopard.
+
+        * Scripts/webkitdirs.pm:
+        (determineBaseProductDir):
+
 2011-07-05  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -142 +142 @@
 
         my $xcodebuildVersionOutput = `xcodebuild -version`;
-        my $xcodeVersion = ($xcodebuildVersionOutput =~ /Xcode ([0-9](\.[0-9]+)*)/) ? $1 : undef;
+        my $xcodeVersion = ($xcodebuildVersionOutput =~ /Xcode ([0-9](\.[0-9]+)*)/) ? $1 : "3.0";
         my $xcodeDefaultsDomain = (eval "v$xcodeVersion" lt v4) ? "com.apple.Xcode" : "com.apple.dt.Xcode";
         my $xcodeDefaultsPrefix = (eval "v$xcodeVersion" lt v4) ? "PBX" : "IDE";