Changeset 1401 in ProjectBuilder

Timestamp:

Feb 3, 2012, 12:17:01 AM (13 years ago)

Author:

Bruno Cornec

Message:

r4486@cabanilles: bruno | 2012-02-01 15:24:46 +0100

• Make the parameter of the -t option optional, in which case the underlying distro is used

File:

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

devel/pb/bin/pb

@@ -53 +53 @@
 my $pbrev;                  # Global REVISION variable
 my $pbaccount;              # Login to use to connect to the VM/RM
-my $pbtarget;               # Target os-ver-arch you want to build for
+my $pbtarget = undef;       # Target os-ver-arch you want to build for
 my $pbport;                 # Port to use to connect to the VM/RM
 my $newver;                 # New version to create
@@ -79 +79 @@
 =head1 SYNOPSIS
 
-pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-t os-ver-arch][-m os-ver-arch[,...]]][-g][-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[,...]]][--nographic][--iso iso][--rebuild] <action> [<pkg1> ...]
+pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-t [os-ver-arch]][-m os-ver-arch[,...]]][-g][-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[,...]]][--nographic][--iso iso][--rebuild] <action> [<pkg1> ...]
 
 =head1 OPTIONS
@@ -483 +483 @@
         "script|s=s" => \$opts{'s'},
         "machines|mock|m=s" => \$opts{'m'},
-        "target|t=s" => \$opts{'t'},
+        "target|t:s" => \$opts{'t'},
         "nographic|g" => \$opts{'g'},
         "port|P=i" => \$opts{'P'},
@@ -544 +544 @@
 if (defined $opts{'t'}) {
     $pbtarget = $opts{'t'};
+    # GetOptions may create an empty string, we use internally undef for that type of target
+    if ($pbtarget eq "") {
+        $pbtarget = undef;
+    }
 }
 
@@ -863 +867 @@
         # We want to at least build for the underlying distro
         # except if a target was given, in which case we only build for it
+        # if -t was passed without target then build for the native distro.
         my $pbos = pb_distro_get_context($pbtarget);
         my $tmpl = pb_get_distros($pbos,$pbtarget);