[Libreoffice-commits] .: solenv/bin

[Michael Meeks]

 solenv/bin/build.pl |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit cee0cdf406ab4c6287b0e1cd0e8d20ade5b81047
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Oct 26 11:35:56 2010 +0100

    cleanup for multi-process builds ...

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 50a4c36..6ea9df9 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -47,7 +47,7 @@
     use lib ("$ENV{SOLARENV}/bin/modules");
     use SourceConfig;
     use RepositoryHelper;
-    
+
     my $in_so_env = 0;
     if (defined $ENV{COMMON_ENV_TOOLS}) {
         unshift(@INC, "$ENV{COMMON_ENV_TOOLS}/modules");
@@ -1750,6 +1750,9 @@ sub cancel_build {
     print "when the problem is isolated and fixed exit and re-run 'make' from the top-level\n";
     print "sometimes (sadly) it is necessary to rm -Rf " . $ENV{INPATH} . " in a module.\n";
 
+    zenity_message("LibreOffice Build Failed!");
+    zenity_close();
+
     do_exit(1);
 };
 
@@ -1997,6 +2000,8 @@ sub mp_success_exit {
 #    };
     print "\nMultiprocessing build is finished\n";
     print "Maximal number of processes run: $maximal_processes\n";
+    zenity_message("LibreOffice Build Success!");
+    zenity_close();
     do_exit(0);
 };
 
@@ -2151,7 +2156,7 @@ sub print_announce {
 sub zenity_open {
     if (defined $ENV{ENABLE_ZENITY}) {
         my $zenity_pid = open3($zenity_in, $zenity_out, $zenity_err,
-                               "/bin/env zenity --notification --listen");
+                               "zenity --notification --listen");
     };
 };
 
@@ -2780,12 +2785,6 @@ sub do_exit {
 #    close_server_socket();
     my $exit_code = shift;
     $build_finished++;
-    if ($exit_code) {
-        zenity_message("LibreOffice Build Failed!")
-    } else {
-        zenity_message("LibreOffice Build Success!")
-    };
-    zenity_close();
     generate_html_file(1);
     if ( $^O eq 'os2' )
     {