Changeset 867

Timestamp:

10/21/09 11:48:11 (4 years ago)

Author:

bruno

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

Files:

• devel/pb-modules/Makefile.PL (modified) (2 diffs)
• devel/pb-modules/etc/pb.conf (modified) (8 diffs)
• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (4 diffs)
• pbconf/devel/ProjectBuilder/deb/project-builder.dirs (modified) (1 diff)
• pbconf/devel/ProjectBuilder/deb/rules (modified) (1 diff)
• pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec (modified) (2 diffs)

devel/pb-modules/Makefile.PL

@@ -1 +1 @@
 use 5.006001;
 use ExtUtils::MakeMaker;
+use strict;
 
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
 WriteMakefile(
-    NAME         => 'PBPKG',
-    DISTNAME     => 'PBPKG',
-    VERSION      => 'PBVER',
-    INST_SCRIPT  => 'blib/bin',
+    NAME         => 'PBPKG',
+    DISTNAME     => 'PBPKG',
+    VERSION      => 'PBVER',
+    INST_SCRIPT  => 'blib/bin',
     INSTALLDIRS  => 'perl',
-    PREREQ_PM    => {
+    PREREQ_PM    => {
             #HTTP::Headers                    => 1.59,
             #Template                         => 0,
-    },    # e.g., Module::Name => 1.1
+    },    # e.g., Module::Name => 1.1
     #ABSTRACT_FROM => 'bin/pb',   # retrieve abstract from module
-    AUTHOR        => 'Bruno Cornec <bruno#project-builder.org>',
+    AUTHOR        => 'Bruno Cornec <bruno#project-builder.org>',
     EXE_FILES     => [ qw( bin/pbdistrocheck ) ],
     MAN3PODS      => {  'lib/ProjectBuilder/Distribution.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Distribution.$(MAN3EXT)',
@@ -22 +23 @@
                         'lib/ProjectBuilder/Base.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Base.$(MAN3EXT)', },
 );
+
+package MY;
+
+sub postamble {
+
+    # Determine location of etc conf files
+    my $text ="";
+
+    # Grab out any CONFDIR param
+    my $confdir = undef;
+
+    while (my $arg = shift @ARGV) {
+        my ($key, $value) = split /=/, $arg;
+        if ($key =~ /^CONFDIR$/) {
+            $confdir = $value;
+        }
+    }
+
+    my $etcdir = $confdir || "/usr/local/etc/pb";
+
+    # Use that conf dir info to modify Distribution.pm
+    system("perl -pi -e \"s~CCCC~$etcdir~\" lib/ProjectBuilder/Distribution.pm");
+
+    $text .= "install ::\n";
+    $text .= "\t".'install -m 755 -d $(DESTDIR)'."$etcdir\n";
+    $text .= "\t".'cp etc/pb.conf $(DESTDIR)'."$etcdir\n";
+    return($text);
+}

devel/pb-modules/etc/pb.conf

@@ -14 +14 @@
 #
 # It should be noted that the list of all OS is the result of gathering 
-# all the keys from osrelfile and osrelambfile
-#
-
+# all the keys from osrelfile and osrelambfile, and the values of osrelambfile
+#
+
+#
+# The following conf info are for pb_distro_get (man ProjectBuilder::Distribution)
 #
 # Those definitions are non-ambiguous (the file only exists for that OS)
@@ -131 +133 @@
 osrelexpr solaris = Solaris (\d+) 
 
+#
+# The following conf info are for pb_distro_init (man ProjectBuilder::Distribution)
+#
 # Ganularity is the following:
 #
@@ -140 +145 @@
 
 # Group OS by family to handle common actions more easily (filtering, install command, ...)
+# Key is osname, Value is osfamily
 osfamily debian = du
 osfamily ubuntu = du
@@ -158 +164 @@
 osfamily freebsd = bsd
 osfamily solaris = sol
-osfamily unknown = unknown
 
 # Group family by build types
+# Key is osfamily, Value is build type
 ostype du = deb
 ostype slack = tgz
@@ -169 +175 @@
 ostype bsd = port
 ostype sol = pkg
-ostype unknown = unknown
 
 # From the most generic to the most specialized, in term of granularity,
 # give the command to use to install on the OS
 # If none is given, no install can takes place
+# key depends on granularity, value is install command
+
+# Chaining the commands allow to only test for what is able to be installed, 
+# not the update of the repo which may well be unaccessible if too old
 osupd du = sudo apt-get update ; sudo apt-get -y install 
 osupd gen = sudo emerge 
@@ -182 +191 @@
 osupd md = sudo urpmi.update -a ; sudo urpmi --auto 
 osupd novell = export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -i 
-osupd unknown = unknown
 
 # From the most generic to the most specialized, in term of granularity,
@@ -189 +197 @@
 # .osname and version 
 # osname being as defined upper as the keys of osrelfile and osrelambfile
+# depends on granularity, value is install command
 
 ossuffix slackware = slack
@@ -199 +208 @@
 
 # For that OS no need to keep the version
+# Key depends on granularity, value is boolean
 osnover gentoo = true
 
-#  For that OS no need to keep the . in the version release
+# For that OS no need to keep the . in the version release
+# Key depends on granularity, value is boolean
 osremovedotinver mandrake = true
 osremovedotinver redhat = true

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);

pbconf/devel/ProjectBuilder/deb/project-builder.dirs

@@ -2 +2 @@
 usr/share/perl
 usr/share/man
+etc/pb

pbconf/devel/ProjectBuilder/deb/rules

@@ -35 +35 @@
 
         # Add here commands to compile the package.
-        perl Makefile.PL
+        perl Makefile.PL CONFDIR=/etc/pb
         $(MAKE)
         touch $@

pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec

@@ -30 +30 @@
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor PBKEYWORD=${RPM_BUILD_ROOT}/PBFINALDIR
+%{__perl} Makefile.PL INSTALLDIRS=vendor PBKEYWORD=${RPM_BUILD_ROOT}/PBFINALDIR CONFDIR=%{_sysconfdir}/pb
 make
 
@@ -54 +54 @@
 #%{_mandir}/man1/*
 %{_mandir}/man3/*
+%{_sysconfdir}/pb
 
 %changelog