Changeset 867 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Oct 21, 2009, 11:48:11 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Transition static distribution into a configuration file typically /etc/pb/pb.conf
• function pb_distro_init adapted to use the new conf file
• function pb_distro_get_param adapted to support osfamily and ostype
• Adapt the package building of pb to the need of the new configuration file

File:

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

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

@@ -84 +84 @@
 my $dsuf = "unknown";
 my $dupd = "unknown";
-my $arch = shift || undef;
+my $darch = shift || undef;
+my $dnover = "false";
+my $drmdot = "false";
 
 # If we don't know which distribution we're on, then guess it
@@ -90 +92 @@
 
 # Initialize arch
-$arch=pb_get_arch() if (not defined $arch);
-
-# There should be unicity of names between ddir dfam and dtype
-# In case of duplicate, bad things can happen
-if (($ddir =~ /debian/) ||
-    ($ddir =~ /ubuntu/)) {
-    $dfam="du";
-    $dtype="deb";
-    $dsuf=".$ddir$dver";
-    # Chaining the commands allow to only test for what is able o be installed, 
-    # not the update of the repo which may well be unaccessible if too old
-    $dupd="sudo apt-get update ; sudo apt-get -y install ";
-} elsif ($ddir =~ /gentoo/) {
-    $dfam="gen";
-    $dtype="ebuild";
-    $dver="nover";
-    $dsuf=".$ddir";
-    $dupd="sudo emerge ";
-} elsif ($ddir =~ /slackware/) {
-    $dfam="slack";
-    $dtype="tgz";
-    $dsuf=".$dfam$dver";
-} elsif (($ddir =~ /suse/) ||
-        ($ddir =~ /sles/)) {
-    $dfam="novell";
-    $dtype="rpm";
-    $dsuf=".$ddir$dver";
-    $dupd="export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -i ";
-} elsif (($ddir =~ /redhat/) ||
-        ($ddir =~ /rhel/) ||
-        ($ddir =~ /fedora/) ||
-        ($ddir =~ /vmware/) ||
-        ($ddir =~ /asianux/) ||
-        ($ddir =~ /centos/)) {
-    $dfam="rh";
-    $dtype="rpm";
-    my $dver1 = $dver;
-    $dver1 =~ s/\.//;
-
-    # By defaut propose yum
-    my $opt = "";
-    if ($arch eq "x86_64") {
-        $opt="--exclude=*.i?86";
-    }
-    $dupd="sudo yum clean all; sudo yum -y update ; sudo yum -y $opt install ";
-    if ($ddir =~ /fedora/) {
-        $dsuf=".fc$dver1";
-    } elsif ($ddir =~ /redhat/) {
-        $dsuf=".rh$dver1";
-        $dupd="unknown";
-    } elsif ($ddir =~ /asianux/) {
-        $dsuf=".asianux$dver1";
-    } elsif ($ddir =~ /vmware/) {
-        $dsuf=".vwm$dver1";
-        $dupd="unknown";
-    } else {
-        # older versions of rhel ran up2date
-        if ((($dver eq "2.1") || ($dver eq "3") || ($dver eq "4")) && ($ddir eq "rhel")) {
-            $dupd="sudo up2date -y ";
-        }
-        $dsuf=".$ddir$dver1";
-    }
-} elsif (($ddir =~ /mandrake/) ||
-        ($ddir =~ /mandrakelinux/) ||
-        ($ddir =~ /mandriva/)) {
-    $dfam="md";
-    $dtype="rpm";
-    if ($ddir =~ /mandrakelinux/) {
-        $ddir = "mandrake";
-    }
-    if ($ddir =~ /mandrake/) {
-        my $dver1 = $dver;
-        $dver1 =~ s/\.//;
-        $dsuf=".mdk$dver1";
-    } else {
-        $dsuf=".mdv$dver";
-    }
-    # Chaining the commands allow to only test for what is able o be installed, 
-    # not the update of the repo which may well be unaccessible if too old
-    $dupd="sudo urpmi.update -a ; sudo urpmi --auto ";
-} elsif ($ddir =~ /freebsd/) {
-    $dfam="bsd";
-    $dtype="port";
-    my $dver1 = $dver;
-    $dver1 =~ s/\.//;
-    $dsuf=".$dfam$dver1";
+$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");
+my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver");
+
+$dfam = pb_distro_get_param($ddir,$dver,$darch,$osfamily);
+$dtype = $ostype->{$dfam} if (defined $ostype->{$dfam});
+$dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype);
+$dsuf = pb_distro_get_param($ddir,$dver,$darch,$ossuffix,$dfam,$dtype);
+$dnover = pb_distro_get_param($ddir,$dver,$darch,$osnover,$dfam,$dtype);
+$drmdot = pb_distro_get_param($ddir,$dver,$darch,$osremovedotinver,$dfam,$dtype);
+
+# Some OS have no interesting version
+$dver = "nover" if ($dnover eq "true");
+
+# For some OS remove the . in version name
+$dver =~ s/\.// if ($drmdot eq "true");
+
+if ((not defined $dsuf) || ($dsuf eq "unknown")) {
+    # By default suffix is a concatenation of .ddir and dver
+    $dsuf = ".$ddir$dver" 
 } else {
-    $dfam="unknown";
-}
-
-return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $arch);
+    # concat just the version to what has been found
+    $dsuf = ".$dsuf$dver";
+}
+
+#   if ($arch eq "x86_64") {
+#   $opt="--exclude=*.i?86";
+#   }
+
+return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch);
 }
 
@@ -557 +502 @@
 my $darch = shift;
 my $opt = shift;
+my $dfam = shift || "unknown";
+my $dtype = shift || "unknown";
 
 if (defined $opt->{"$ddir-$dver-$darch"}) {
@@ -564 +511 @@
 } elsif (defined $opt->{"$ddir"}) {
     $param = $opt->{"$ddir"};
+} elsif (defined $opt->{$dfam}) {
+    $param = $opt->{$dfam};
+} elsif (defined $opt->{$dtype}) {
+    $param = $opt->{$dtype};
 } elsif (defined $opt->{"default"}) {
     $param = $opt->{"default"};
 } else {
-    $param = "";
+    $param = "unknown";
 }
 return($param);