[webkit-changes] [105522] trunk/Tools

[vestbo]

Title: [105522] trunk/Tools

Revision

105522

Author

ves...@webkit.org

Date

2012-01-20 09:35:12 -0800 (Fri, 20 Jan 2012)

Log Message

build-webkit: Don't spit out congratulations message on Ctrl+C

Reviewed by Andreas Kling.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/build-webkit

Diff

Modified: trunk/Tools/ChangeLog (105521 => 105522)

--- trunk/Tools/ChangeLog	2012-01-20 17:07:10 UTC (rev 105521)
+++ trunk/Tools/ChangeLog	2012-01-20 17:35:12 UTC (rev 105522)
@@ -1,3 +1,11 @@
+2012-01-20  Tor Arne Vestbø  <tor.arne.ves...@nokia.com>
+
+        build-webkit: Don't spit out congratulations message on Ctrl+C
+
+        Reviewed by Andreas Kling.
+
+        * Scripts/build-webkit:
+
 2012-01-20  Philippe Normand  <pnorm...@igalia.com>
 
         [GTK] Allow extra jhbuild modulesets

Modified: trunk/Tools/Scripts/build-webkit (105521 => 105522)

--- trunk/Tools/Scripts/build-webkit	2012-01-20 17:07:10 UTC (rev 105521)
+++ trunk/Tools/Scripts/build-webkit	2012-01-20 17:35:12 UTC (rev 105522)
@@ -599,13 +599,15 @@
     exit exitStatus(copyInspectorFrontendFiles());
 }
 
+my $result = 0;
+
 if (isWx()) {
     $makeArgs .= " --port=wx";
 
     downloadWafIfNeeded();
     @options = split(/ /, $makeArgs);
     @projects = ();
-    my $result = buildWafProject('.', $clean, @options);
+    $result = buildWafProject('.', $clean, @options);
     exit exitStatus($result) if exitStatus($result);
 }
 
@@ -629,7 +631,7 @@
     # Chromium doesn't build by project directories.
     @projects = ();
     push @options, "--makeargs=" . $makeArgs if $makeArgs;
-    my $result = buildChromium($clean, @options);
+    $result = buildChromium($clean, @options);
     exit exitStatus($result) if exitStatus($result);
 }
 
@@ -657,14 +659,14 @@
 
 if (isQt()) {
     @projects = (); # An empty projects list will build the default projects
-    my $result = buildQMakeProjects(\@projects, $clean, @options);
+    $result = buildQMakeProjects(\@projects, $clean, @options);
     exit exitStatus($result) if exitStatus($result);
 }
 
 # Build, and abort if the build fails.
 for my $dir (@projects) {
     chdir $dir or die;
-    my $result = 0;
+    $result = 0;
 
     # For Gtk the WebKit project builds all others
     if (isGtk() && $dir ne "Source/WebKit") {
@@ -712,6 +714,9 @@
 # Don't report the "WebKit is now built" message after a clean operation.
 exit if $clean;
 
+# Don't report congrats message if build was interrupted by the user.
+exit if ($result & 127) == SIGINT;
+
 # Write out congratulations message.
 writeCongrats();
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes