[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit fd16bb8f61fa1ff30e72e2e4cab060469934c55c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 17:49:46 2010 +0000

    2010-02-17  Julien Chaffraix  <jchaffraix at webkit.org>
    
            Reviewed by Ariya Hidayat.
    
            Remove some warnings seen when building Qt
            https://bugs.webkit.org/show_bug.cgi?id=35017
    
            Using a machine without the needed tools to build WebKit leads to
            several errors and warnings.
    
            * Scripts/webkitdirs.pm: Refactored the code testing the command's
            presence into a commandExists routine. While doing so removed, stderr
            output as it usually does not give anything more than our message. Also
            added a Qt check for qmake that was missing.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54899 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ea3abaf..c5bb397 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-17  Julien Chaffraix  <jchaffraix at webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
+        Remove some warnings seen when building Qt
+        https://bugs.webkit.org/show_bug.cgi?id=35017
+
+        Using a machine without the needed tools to build WebKit leads to
+        several errors and warnings.
+
+        * Scripts/webkitdirs.pm: Refactored the code testing the command's
+        presence into a commandExists routine. While doing so removed, stderr
+        output as it usually does not give anything more than our message. Also
+        added a Qt check for qmake that was missing.
+
 2010-02-17  Xan Lopez  <xlopez at igalia.com>
 
         Rubber-stamped by Gustavo Noronha.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index a788b3d..9c79a72 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -614,9 +614,17 @@ sub qtFeatureDefaults()
     return %qtFeatureDefaults;
 }
 
+sub commandExists($)
+{
+    my $command = shift;
+    my $devnull = File::Spec->devnull();
+    return `$command --version 2> $devnull`;
+}
+
 sub determineQtFeatureDefaults()
 {
     return if %qtFeatureDefaults;
+    die "ERROR: qmake missing but required to build WebKit.\n" if not commandExists("qmake");
     my $originalCwd = getcwd();
     chdir File::Spec->catfile(sourceDir(), "WebCore");
     my $defaults = `qmake CONFIG+=compute_defaults 2>&1`;
@@ -891,10 +899,9 @@ sub checkRequiredSystemConfig
         my @cmds = qw(flex bison gperf);
         my @missing = ();
         foreach my $cmd (@cmds) {
-            if (not `$cmd --version`) {
-                push @missing, $cmd;
-            }
+            push @missing, $cmd if not commandExists($cmd);
         }
+
         if (@missing) {
             my $list = join ", ", @missing;
             die "ERROR: $list missing but required to build WebKit.\n";
@@ -1162,7 +1169,7 @@ sub qtMakeCommand($)
     #print "default spec: " . $mkspec . "\n";
     #print "compiler found: " . $compiler . "\n";
 
-    if ($compiler eq "cl") {
+    if ($compiler && $compiler eq "cl") {
         return "nmake";
     }
 

-- 
WebKit Debian packaging