Changeset 869

Timestamp:

10/21/09 14:11:13 (4 years ago)

Author:

bruno

Message:

• function pb_distro_get now also uses the external pb.conf conf file. Nothing is hard coded anymore in the Distribution.pm which will make porting and adaptations by users much easier.

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (5 diffs)

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

@@ -67 +67 @@
 Mandriva, Open SuSE and Fedora have all the same "rpm" type of build system. Ubuntu ad Debian have the same "deb" type of build system. 
 And "fc" is the extension generated for all Fedora packages (Version will be added by pb).
+All these information are stored in an external configuration file typically at /etc/pb/pb.conf
 
 When passing the distribution name and version as parameters, the B<pb_distro_init> function returns the parameter of that distribution instead of the underlying one.
@@ -88 +89 @@
 my $drmdot = "false";
 
-# If we don't know which distribution we're on, then guess it
-($ddir,$dver) = pb_distro_get() if ((not defined $ddir) || (not defined $dver));
-
-# Initialize arch
-$darch=pb_get_arch() if (not defined $darch);
-
 # Adds conf file for distribution description
 # the location of the conf file is finalyzed at install time
 # depending whether we deal with package install or tar file install
 pb_conf_add("CCCC/pb.conf");
+
+# If we don't know which distribution we're on, then guess it
+($ddir,$dver) = pb_distro_get() if ((not defined $ddir) || (not defined $dver));
+
+# Initialize arch
+$darch=pb_get_arch() if (not defined $darch);
+
 my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver");
 
@@ -138 +140 @@
 sub pb_distro_get {
 
-my $base="/etc";
-
-# List of files that unambiguously indicates what distro we have
-my %single_rel_files = (
-# Tested
-    'gentoo'            =>  'gentoo-release',       # >= 1.6
-    'slackware'         =>  'slackware-version',    # >= 10.2
-    'mandriva'          =>  'mandriva-release',     # >=2006.0
-    'mandrakelinux'     =>  'mandrakelinux-release',# = 10.2
-    'fedora'            =>  'fedora-release',       # >= 4
-    'vmware'            =>  'vmware-release',       # >= 3
-    'sles'              =>  'sles-release',         # Doesn't exist as of 10
-    'asianux'           =>  'asianux-release',      # >= 2.2
-# Untested
-    'knoppix'           =>  'knoppix_version',      #
-    'yellowdog'         =>  'yellowdog-release',    #
-    'esmith'            =>  'e-smith-release',      #
-    'turbolinux'        =>  'turbolinux-release',   #
-    'blackcat'          =>  'blackcat-release',     #
-    'aurox'             =>  'aurox-release',        #
-    'annvix'            =>  'annvix-release',       #
-    'cobalt'            =>  'cobalt-release',       #
-    'redflag'           =>  'redflag-release',      #
-    'ark'               =>  'ark-release',          #
-    'pld'               =>  'pld-release',          #
-    'nld'               =>  'nld-release',          #
-    'lfs'               =>  'lfs-release',          #
-    'mk'                =>  'mk-release',           #
-    'conectiva'         =>  'conectiva-release',    #
-    'immunix'           =>  'immunix-release',      #
-    'tinysofa'          =>  'tinysofa-release',     #
-    'trustix'           =>  'trustix-release',      #
-    'adamantix'         =>  'adamantix_version',    #
-    'yoper'             =>  'yoper-release',        #
-    'arch'              =>  'arch-release',         #
-    'libranet'          =>  'libranet_version',     #
-    'valinux'           =>  'va-release',           #
-    'yellowdog'         =>  'yellowdog-release',    #
-    'ultrapenguin'      =>  'ultrapenguin-release', #
-    );
-
-# List of files that ambiguously indicates what distro we have
-my %ambiguous_rel_files = (
-    'mandrake'          =>  'mandrake-release',     # <= 10.1
-    'debian'            =>  'debian_version',       # >= 3.1
-    'suse'              =>  'SuSE-release',         # >= 10.0
-    'redhat'            =>  'redhat-release',       # >= 7.3
-    'lsb'               =>  'lsb-release',          # ???
-    );
-
-# Should have the same keys as the previous one.
-# If ambiguity, which other distributions should be checked
-my %distro_similar = (
-    'mandrake'          => ['mandrake', 'mandrakelinux'],
-    'debian'            => ['debian', 'ubuntu'],
-    'suse'              => ['suse', 'sles', 'opensuse'],
-    'redhat'            => ['redhat', 'rhel', 'centos', 'mandrake', 'vmware'],
-    'lsb'               => ['ubuntu', 'lsb'],
-    );
-
-my %distro_match = (
-# Tested
-    'gentoo'                => '.* version (.+)',
-    'slackware'             => 'S[^ ]* (.+)$',
-# There should be no ambiguity between potential ambiguous distro
-    'mandrakelinux'         => 'Mandrakelinux release (.+) \(',
-    'mandrake'              => 'Mandr[^ ]* release (.+) \(',
-    'mandriva'              => 'Mandr[^ ]* [^ ]* release (.+) \(',
-    'fedora'                => 'Fedora .*release (\d+) \(',
-    'vmware'                => 'VMware ESX Server (\d+) \(',
-    'rhel'                  => 'Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9.]+).* \(',
-    'centos'                => '.*CentOS .*release ([0-9]).* ',
-    'redhat'                => 'Red Hat Linux release (.+) \(',
-    'sles'                  => 'SUSE .* Enterprise Server (\d+) \(',
-    'suse'                  => 'SUSE LINUX (\d.+) \(',
-    'opensuse'              => 'openSUSE (\d.+) \(',
-    'asianux'               => 'Asianux (?:Server|release) ([0-9]).* \(',
-    'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',
-# Ubuntu includes a /etc/debian_version file that creates an ambiguity with debian
-# So we need to look at distros in reverse alphabetic order to treat ubuntu always first
-    'ubuntu'                => '.*Ubuntu.*\nDISTRIB_RELEASE=(.+)',
-    'debian'                => '(.+)',
-# Not tested
-    'arch'                  => '.* ([0-9.]+) .*',
-    'redflag'               => 'Red Flag (?:Desktop|Linux) (?:release |\()(.*?)(?: \(.+)?\)',
-);
+# 1: List of files that unambiguously indicates what distro we have
+# 2: List of files that ambiguously indicates what distro we have
+# 3: Should have the same keys as the previous one. If ambiguity, which other distributions should be checked
+# 4: Matching Rg. Expr to detect distribution and version
+my ($single_rel_files, $ambiguous_rel_files,$distro_similar,$distro_match) = pb_conf_get("osrelfile","osrelambfile","osambiguous","osrelexpr");
 
 my $release;
@@ -231 +152 @@
 # that way we reduce the choice
 my ($d,$r);
-while (($d,$r) = each %single_rel_files) {
-    if (-f "$base/$r" && ! -l "$base/$r") {
-        my $tmp=pb_get_content("$base/$r");
+while (($d,$r) = each %$single_rel_files) {
+    if (-f "$r" && ! -l "$r") {
+        my $tmp=pb_get_content("$r");
         # Found the only possibility. 
         # Try to get version and return
-        if (defined ($distro_match{$d})) {
-            ($release) = $tmp =~ m/$distro_match{$d}/m;
+        if (defined ($distro_match->{$d})) {
+            ($release) = $tmp =~ m/$distro_match->{$d}/m;
         } else {
             print STDERR "Unable to find $d version in $r\n";
@@ -250 +171 @@
 # Ubuntu includes a /etc/debian_version file that creates an ambiguity with debian
 # So we need to look at distros in reverse alphabetic order to treat ubuntu always first via lsb
-foreach $d (reverse keys %ambiguous_rel_files) {
-    $r = $ambiguous_rel_files{$d};
-    if (-f "$base/$r" && !-l "$base/$r") {
+foreach $d (reverse keys %$ambiguous_rel_files) {
+    $r = $ambiguous_rel_files->{$d};
+    if (-f "$r" && !-l "$r") {
         # Found one possibility. 
         # Get all distros concerned by that file
-        my $tmp=pb_get_content("$base/$r");
+        my $tmp=pb_get_content("$r");
         my $found = 0;
-        my $ptr = $distro_similar{$d};
+        my $ptr = $distro_similar->{$d};
         pb_log(2,"amb: ".Dumper($ptr)."\n");
         $release = "unknown";
-        foreach my $dd (@$ptr) {
+        foreach my $dd (split(/,/,$ptr)) {
             pb_log(2,"check $dd\n");
             # Try to check pattern
-            if (defined $distro_match{$dd}) {
-                pb_log(2,"cmp: $distro_match{$dd} - vs - $tmp\n");
-                ($release) = $tmp =~ m/$distro_match{$dd}/m;
+            if (defined $distro_match->{$dd}) {
+                pb_log(2,"cmp: $distro_match->{$dd} - vs - $tmp\n");
+                ($release) = $tmp =~ m/$distro_match->{$dd}/m;
                 if ((defined $release) && ($release ne "unknown")) {
                     $distro = $dd;