[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ddkilzer at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit f0a9ae48c51fde77d33e6199aca1d288b5efa1f4
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 29 00:46:59 2011 +0000

    <rdar://problem/8930699> build-webkit gives a bogus warning with newer versions of Xcode
    
    Reviewed by Mark Rowe.
    
    * Scripts/webkitdirs.pm:
    (checkRequiredSystemConfig): Check the Xcode marketing version
    in addition to the DevCoreTools build version before complaining
    about an old version of Xcode.  Also make the Mac OS X version
    check use Perl's built-in version string comparitor.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77028 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index ee91c88..7319fb1 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-28  David Kilzer  <ddkilzer at apple.com>
+
+        <rdar://problem/8930699> build-webkit gives a bogus warning with newer versions of Xcode 
+
+        Reviewed by Mark Rowe.
+
+        * Scripts/webkitdirs.pm:
+        (checkRequiredSystemConfig): Check the Xcode marketing version
+        in addition to the DevCoreTools build version before complaining
+        about an old version of Xcode.  Also make the Mac OS X version
+        check use Perl's built-in version string comparitor.
+
 2011-01-28  Dirk Pranke  <dpranke at chromium.org>
 
         Unreviewed, build fix.
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 9ee56d3..aa7bab7 100644
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1009,14 +1009,18 @@ sub checkRequiredSystemConfig
 {
     if (isDarwin()) {
         chomp(my $productVersion = `sw_vers -productVersion`);
-        if ($productVersion lt "10.4") {
+        if (eval "v$productVersion" lt v10.4) {
             print "*************************************************************\n";
             print "Mac OS X Version 10.4.0 or later is required to build WebKit.\n";
             print "You have " . $productVersion . ", thus the build will most likely fail.\n";
             print "*************************************************************\n";
         }
-        my $xcodeVersion = `xcodebuild -version`;
-        if ($xcodeVersion !~ /DevToolsCore-(\d+)/ || $1 < 747) {
+        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) {
             print "*************************************************************\n";
             print "Xcode Version 2.3 or later is required to build WebKit.\n";
             print "You have an earlier version of Xcode, thus the build will\n";

-- 
WebKit Debian packaging