Changeset 1064 in ProjectBuilder for devel/pb-modules

Timestamp:

Jun 27, 2010, 8:23:38 AM (15 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

Location:

devel/pb-modules

Files:

• bin/pbdistrocheck (modified) (1 diff)
• etc/pb.conf (modified) (3 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (7 diffs)

devel/pb-modules/bin/pbdistrocheck

@@ -93 +93 @@
 @param = split(/-/,$dist) if (defined $dist);
 
-my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
+my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
 if (defined $opts{'d'}) {
     print "\u$ddir $dver $arch\n";

devel/pb-modules/etc/pb.conf

@@ -138 +138 @@
 # Ganularity is the following:
 #
+#osname
 # ostype
 #   osfamily
@@ -177 +178 @@
 ostype sol = pkg
 
+# Group ostype by os
+# Key is ostype, Value is os name
+os deb = linux
+os tgz = linux
+os ebuild = linux
+os rpm = linux
+os port = bsd
+os pkg = solaris
+
 # From the most generic to the most specialized, in term of granularity,
 # give the command to use to install on the OS
@@ -213 +223 @@
 #ossuffix rhel = rhel
 #ossuffix centos = el
+#
 
 # For that OS no need to keep the version

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

@@ -42 +42 @@
   # Return information on the running distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $dos, $pbupd, $arch) = pb_distro_init();
   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
   # 
   # Return information on the requested distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
+  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
   # 
@@ -53 +53 @@
   #
   my ($ddir,$dver) = pb_distro_get();
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver);
+  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver);
   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
 
@@ -95 +95 @@
 my $dfam = "unknown";
 my $dtype = "unknown";
+my $dos = "unknown";
 my $dsuf = "unknown";
 my $dupd = "unknown";
@@ -112 +113 @@
 $darch=pb_get_arch() if (not defined $darch);
 
-my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver");
+my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver,$os) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver","os");
 
 # Dig into the tuple to find the best answer
 $dfam = pb_distro_get_param($ddir,$dver,$darch,$osfamily);
+$dos = pb_distro_get_param($ddir,$dver,$darch,$os);
 $dtype = $ostype->{$dfam} if (defined $ostype->{$dfam});
 $dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype);
@@ -141 +143 @@
 pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch\n");
 
-return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch);
+return($ddir, $dver, $dfam, $dtype, $dos, $dsuf, $dupd, $darch);
 }
 
@@ -431 +433 @@
 my $dfam = shift || "unknown";
 my $dtype = shift || "unknown";
+my $dos = shift || "unknown";
 
 if (defined $opt->{"$ddir-$dver-$darch"}) {
@@ -442 +445 @@
 } elsif (defined $opt->{$dtype}) {
     $param = $opt->{$dtype};
+} elsif (defined $opt->{$dos}) {
+    $param = $opt->{$dos};
 } elsif (defined $opt->{"default"}) {
     $param = $opt->{"default"};