Changeset 1064 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Jun 27, 2010, 8:23:38 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3931@dhcp184-49-175-19: bruno | 2010-06-26 08:02:59 +0200

• Adds the notion of os at the top in order to provide an even better tuple management

File:

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

devel/pb/bin/pb

@@ -612 +612 @@
         my %build;
         # We want to at least build for the underlying distro
-        my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
         my $tmpl = "$ddir-$dver-$arch,";
         my %patches;
@@ -659 +659 @@
                 chomp($arch);
                 my ($ddir, $dver, $dfam);
-                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}, $pb{'arch'}) = pb_distro_init($name,$ver,$arch);
+                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'os'}, $pb{'suf'}, $pb{'upd'}, $pb{'arch'}) = pb_distro_init($name,$ver,$arch);
                 pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
                 pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
@@ -866 +866 @@
 sub pb_test2pkg {
     # Get the running distro to test on
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
     pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
 
@@ -886 +886 @@
 
     # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
     pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
 
@@ -1194 +1194 @@
             ($odir,$over,$oarch) = split(/-/,$v);
         }
-        ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over,$oarch);
+        ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($odir,$over,$oarch);
         pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
 
@@ -1740 +1740 @@
         my ($name,$ver,$darch) = split(/-/,$v);
         chomp($darch);
-        my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver,$darch);
+        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
 
         # Get VE context
@@ -2218 +2218 @@
     my ($name,$ver,$darch) = split(/-/,$v);
     chomp($darch);
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
+    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
     
     # Name of the account to deal with for VM/VE
@@ -2416 +2416 @@
 # And we now need the conf file required for this to work created above
 
-my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $darch) = pb_distro_init(); 
+my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch) = pb_distro_init(); 
 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $darch))."\n";
 
@@ -2561 +2561 @@
     my ($name,$ver,$darch) = split(/-/,$v);
     chomp($darch);
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver,$darch);
+    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
     my ($vepath) = pb_conf_get("vepath");
 
@@ -2809 +2809 @@
 
     # Get all required parameters
-    my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
+    my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
 
     # DB of announces for external usage (Web pages generation)