Changeset 1120 in ProjectBuilder

Timestamp:

Dec 4, 2010, 2:46:48 AM (13 years ago)

Author:

Bruno Cornec

Message:

• remove the test on the '>' char in pb_stsem as there are too many false positive. Use "noredir" in pbinit of website instead.
• Adds support for -t option to prepare a builbot or similar interface.

Files:

• devel/pb-modules/lib/ProjectBuilder/Base.pm (modified) (1 diff)
• devel/pb/bin/pb (modified) (7 diffs)
• pbconf/devel/website/pbinit (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -148 +148 @@
 unlink("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
 $redir = "2>> $ENV{'PBTMP'}/system.log 1>> $ENV{'PBTMP'}/system.log" if ((! defined $verbose) || ($verbose ne "noredir"));
-# If there is a redirection in the command, then do not redirect in system.log 
-# as you won't get the redirection working as expected
-$redir = "" if ($cmd =~ /\>/);
 system("$cmd $redir");
 my $res = $?;

devel/pb/bin/pb

@@ -52 +52 @@
 my $pbrev;                  # Global REVISION variable
 my $pbaccount;              # Login to use to connect to the VM
+my $pbtarget;               # Target os-ver-arch you want to build for
 my $pbport;                 # Port to use to connect to the VM
 my $newver;                 # New version to create
@@ -77 +78 @@
 =head1 SYNOPSIS
 
-pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-m mach-1[,...]]][-i iso] <action> [<pkg1> ...]
-
-pb [--verbose][--help][--man][--quiet][--snapshot][--revision pbroot][--project project][[--script script --account account --port port][--machine mach-1[,...]]][--iso iso] <action> [<pkg1> ...]
+pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-t os-ver-arch][-m os-ver-arch[,...]]][-i iso] <action> [<pkg1> ...]
+
+pb [--verbose][--help][--man][--quiet][--snapshot][--revision pbroot][--project project][[--script script --account account --port port][--target os-ver-arch][--machine os-ver-arch[,...]]][--iso iso] <action> [<pkg1> ...]
 
 =head1 OPTIONS
@@ -105 +106 @@
 Prints the manual page and exits.
 
-=item B<-m|--machine machine1[,machine2,...]>
+=item B<-t|--target os-ver-arch>
+
+Name of the target system you want to build for.
+All if none precised.
+
+=item B<-m|--machine os-ver-arch[,os-ver-arch,...]>
 
 Name of the Virtual Machines (VM) or Virtual Environments (VE) you want to build on (coma separated). 
@@ -411 +417 @@
         "script|s=s" => \$opts{'s'},
         "machines|mock|m=s" => \$opts{'m'},
+        "target|t=s" => \$opts{'t'},
         "port|P=i" => \$opts{'P'},
         "project|p=s" => \$opts{'p'},
@@ -466 +473 @@
 if (defined $opts{'i'}) {
     $iso = $opts{'i'};
+}
+if (defined $opts{'t'}) {
+    $pbtarget = $opts{'t'};
 }
 
@@ -636 +646 @@
     # We need 2 lines here
     my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
-    my @pt = pb_conf_get_if("vmlist","velist");
 
     # declare packager and repo for filtering
@@ -715 +724 @@
 
         my %build;
+        my %patches;
         # We want to at least build for the underlying distro
-        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init();
+        # except if a target was given, in which case we only build for it
+        my ($tdir,$tver,$tarch);
+        ($tdir,$tver,$tarch) = split(/-/,$pbtarget) if (defined ($pbtarget));
+
+        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init($tdir,$tver,$tarch);
         my $tmpl = "$ddir-$dver-$arch,";
-        my %patches;
-
-        # Get list of distributions for which we need to generate build files
-        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'}} 
+
+        # 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");
+            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'}} 
+            }
         }
     

pbconf/devel/website/pbinit

@@ -98 +98 @@
     # generate ps pages
     #system("groff -Tps -mandoc $f.$ext > ../docs/$f.$ext.ps");
-    pb_system("groff -Tps -mandoc $f.$ext > ../docs/$f.$ext.ps","Generating Postscript pages");
+    # Use noredir here because is doesn't redirect to the right place without
+    pb_system("groff -Tps -mandoc $f.$ext > ../docs/$f.$ext.ps","Generating Postscript pages","noredir");
     # generate pdf pages
     pb_system("ps2pdf ../docs/$f.$ext.ps","Generating PDF pages");