2006-01-10 Mark Rowe <opendarwin.org@bdash.net.nz>

        Reviewed by eseidel.  Committed by eseidel.

        - build-webkit should exit with non-zero status when build fails
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6459

        * Scripts/build-webkit:
        Use correct bits of subprocess exit code when passing back through
        as build-webkit's exit code.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5fb1e63ba6e03062e3c158bd30201d2811cd4cf5..5e047c6e82f1bd529c2a5527b161036835e73558 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-10  Mark Rowe  <opendarwin.org@bdash.net.nz>
+
+        Reviewed by eseidel.  Committed by eseidel.
+
+        - build-webkit should exit with non-zero status when build fails
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6459
+
+        * Scripts/build-webkit:
+        Use correct bits of subprocess exit code when passing back through
+        as build-webkit's exit code.
+
 2006-01-10  Eric Seidel  <eseidel@apple.com>
 
         Restored corrupted nibs from TOT CVS.

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 74fffc0cda56fa92de0334e9765f6eb945db268a..f7ef1ee3f6f0027fe4046776f648dfc1d6390fba 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -33,6 +33,7 @@ use FindBin;
 use Getopt::Long qw(:config pass_through);
 use lib $FindBin::Bin;
 use webkitdirs;
+use POSIX;
 
 my $svgSupport = 1;
 GetOptions('svg!' => \$svgSupport);
@@ -82,10 +83,10 @@ for my $dir (@projects) {
     } else {
         $result = system "xcodebuild", "-project", "$dir.xcodeproj", @options, @ARGV;
     }
-    exit $result if $result;
+    exit WEXITSTATUS($result) if WEXITSTATUS($result);
     if ($dir eq "JavaScriptCore") {
         $result = system "xcodebuild", "-project", "$dir.xcodeproj", "-target", "testkjs", @options, @ARGV;
-        exit $result if $result;
+        exit WEXITSTATUS($result) if WEXITSTATUS($result);
     }
     chdir ".." or die;
 }