Changeset 1552 in ProjectBuilder for devel/pb/bin

Timestamp:

May 21, 2012, 2:57:56 AM (13 years ago)

Author:

Bruno Cornec

Message:

• pb: log when we start and finish the build, that's an important state. Add missing setting of all_ok to false that kept us from properly stopping on errors. Fix typos in comments. Greatly simplify pb_get_distros function by using split and join. Also remove whitespace since multi-line conf file support will cause that to be added.
• Filter.pm: use new pb_pbos_to_keylist function to generate the list of basenames we want, and use a loop rather than lots of separate statements. Simplifies and makes more powerful this function. Also now guaranteed to maintain consistency with key lookups in the hash maps.

File:

• devel/pb/bin/pb (modified) (9 diffs)

devel/pb/bin/pb

@@ -119 +119 @@
 
 Name of the Virtual Machines (VM), Virtual Environments (VE) or Remote Machines (RM) 
-you want to build on (coma separated). 
+you want to build on (comma separated). 
 All if none precised (or use the env variable PBV).
 
@@ -1374 +1374 @@
 sub pb_build2pkg {
 
+    pb_log(0,"INFO: ------ Starting to build package ------\n");
     # Get the running distro to build on
     my $pbos = pb_distro_get_context();
@@ -1754 +1755 @@
     print KEEP "$made\n";
     close(KEEP);
+    pb_log(0,"INFO: ------ Finished building package ------\n");
 }
 
@@ -2658 +2660 @@
     $pm->run_on_finish(sub { my ($pid, $code, $id, $signal, $dump) = @_;
                             unless ($code == 0 && $signal == 0 && $dump == 0) {
+                                $all_ok = 0;
                                 pb_log(0,"ERROR: pid $pid failed\n");
                             }
@@ -4080 +4083 @@
 }
 
-sub pb_add_coma {
+sub pb_add_comma {
 
 my $str = shift;
@@ -4103 +4106 @@
 # This function works for both patches and additional sources
 foreach my $p (sort(<$sdir/*>)) {
-    $ptr->{$key} = pb_add_coma($ptr->{$key},"file://$p") if (($p =~ /\.all$/) || ($p =~ /\.$pbos->{'os'}$/) || ($p =~ /\.$pbos->{'type'}$/) || ($p =~ /\.$pbos->{'family'}$/) || ($p =~ /\.$pbos->{'name'}$/) || ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}$/) ||($p =~ /\.$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}$/));
+    $ptr->{$key} = pb_add_comma($ptr->{$key},"file://$p") if (($p =~ /\.all$/) || ($p =~ /\.$pbos->{'os'}$/) || ($p =~ /\.$pbos->{'type'}$/) || ($p =~ /\.$pbos->{'family'}$/) || ($p =~ /\.$pbos->{'name'}$/) || ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}$/) ||($p =~ /\.$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}$/));
 }
 
@@ -4116 +4119 @@
     while (<PATCH>) {
         chomp();
-        $ptr->{$key} = pb_add_coma($ptr->{$key},"$_");
+        $ptr->{$key} = pb_add_comma($ptr->{$key},"$_");
     }
     close(PATCH);
@@ -4284 +4287 @@
 }
 
-# return list of all distributins supported, coma separated
+# return list of all distributins supported, comma separated
 sub pb_get_distros {
 
@@ -4290 +4293 @@
 my $pbtarget = shift;
 
-my $tmpl = "$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'},";
+my $dists = ("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
 
 # Get list of distributions for which we need to generate build files if no target
 if (not defined $pbtarget) {
     my @pt = pb_conf_get_if("vmlist","velist","rmlist");
-    if (defined $pt[0]->{$ENV{'PBPROJ'}}) {
-        $tmpl .= $pt[0]->{$ENV{'PBPROJ'}};
-    }
-    if (defined $pt[1]->{$ENV{'PBPROJ'}}) {
-        # The 2 lists need to be grouped with a ',' separating them
-        if ($tmpl ne "") {
-            $tmpl .= ",";
-        }
-        $tmpl .= $pt[1]->{$ENV{'PBPROJ'}} 
-    }
-    if (defined $pt[2]->{$ENV{'PBPROJ'}}) {
-        # The lists needs to be grouped with a ',' separating them
-        if ($tmpl ne "") {
-            $tmpl .= ",";
-        }
-    $tmpl .= $pt[2]->{$ENV{'PBPROJ'}} 
-    }
-}
-return($tmpl);
+    foreach my $pt (@pt) {
+        push(@dists, split(/,/, $pt->{$ENV{PBPROJ}})) if defined $pt->{$ENV{PBPROJ}};
+    }
+    # remove any whitespace
+    grep(s/\s+//go, @dists); 
+}
+return(join(",",@dists));
 }