Changeset 1282 in ProjectBuilder

Timestamp:

Mar 25, 2011, 2:42:28 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix partially #96. Still needs to deal with pkg name vs real pkg names

File:

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

devel/pb/bin/pb

@@ -844 +844 @@
         # except if a target was given, in which case we only build for it
         my $pbos = pb_distro_get_context($pbtarget);
-        my $tmpl = "$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 needs 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'}} 
-            }
-        }
-    
+        my $tmpl = pb_get_distros($pbos,$pbtarget);
+
         # Setup $pb structure to allow filtering later on, on files using that structure
         $pb->{'tag'} = $pbtag;
@@ -3254 +3232 @@
     # Get all required parameters
     my ($pbpackager,$pbrepo,$pbml,$pbsmtp) = pb_conf_get("pbpackager","pbrepo","pbml","pbsmtp");
-    my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
+    my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
     my $pkg = pb_cms_get_pkg($defpkgdir,$extpkgdir);
     my @pkgs = @$pkg;
@@ -3260 +3238 @@
     my $first = 0;
 
+    # Get all distros concerned
+    my $pbos = pb_distro_get_context();
+    my $distrolist = pb_get_distros($pbos,undef);
+    my %dl;
+    foreach my $d (split(/,/,$distrolist)) {
+        my ($d1,$d2, $d3) = split(/-/,$d);
+        $dl{$d1}++;
+    }
+
     # Command to find packages on repo
-    my $findstr = "find . ";
+    my $findstr = "find ".join(" ",keys %dl)." ";
     # Generated announce files
     my @files;
@@ -3282 +3269 @@
 
         # TODO: use virtual/real names here now
-        $findstr .= "-name \'$pbpkg-$pbver-$pbtag\.*.rpm\' -o -name \'$pbpkg"."_$pbver*\.deb\' -o -name \'$pbpkg-$pbver*\.ebuild\' -o -name \'$pbpkg-$pbver*\.pkg\' -o -name \'$pbpkg-$pbver*\.sd\'";
+        $findstr .= "-name \'$pbpkg-$pbver-$pbtag\.*.rpm\' -o -name \'$pbpkg"."_$pbver*\.deb\' -o -name \'$pbpkg-$pbver*\.ebuild\' -o -name \'$pbpkg-$pbver*\.pkg\' -o -name \'$pbpkg-$pbver*\.sd\' ";
 
         my $chglog;
@@ -3312 +3299 @@
     # Prepare the command to run and execute it
     open(PBS,"> $ENV{'PBTMP'}/pbscript") || die "Unable to create $ENV{'PBTMP'}/pbscript";
+    print PBS "set -x\n" if ($pbdebug gt 1);
     print PBS "$findstr\n";
     close(PBS);
@@ -3854 +3842 @@
 }
 
+# return list of all distributins supported, coma separated
+sub pb_get_distros {
+
+my $pbos = shift;
+my $pbtarget = shift;
+
+my $tmpl = "$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 needs 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);
+}   
+
 1;