Changeset 11

Timestamp:

07/30/07 02:21:01 (6 years ago)

Author:

bruno

Message:

Addition of distro management

Location:

devel/pb

Files:

• bin/pb.pl (modified) (2 diffs)
• lib/common.pm (modified) (2 diffs)
• lib/distro.pm (modified) (1 diff)

devel/pb/bin/pb.pl

@@ -20 +20 @@
 use common qw (env_init);
 use pb qw (defpkgdir extpkgdir version pb_init);
+use distro qw (distro_init);
 use cms;
 
@@ -126 +127 @@
             print " OK\n";
         }
+        open(D,"$ENV{'PBCONF'}/DISTROS") || die "Unable to find $ENV{'PBCONF'}/DISTROS\n";
+        while (<D>) {
+            my $d = $_;
+            my ($dir,$ver) = split(/_/,$d);
+            chomp($ver);
+            print "Generating build files for $dir ($ver)\n";
+            my ($ddir, $dver, $dfam, $dtype, $dsuf) = distro_init($dir,$ver);
+            #print Dumper($ddir, $dver, $dfam, $dtype, $dsuf);
+        }
+        close(D);
     }
 } else {

devel/pb/lib/common.pm

@@ -57 +57 @@
 # Check pb conf compliance
 #
-die "Project $ENV{'PBPROJ'} not ProjectBuild compliant. Please populate $ENV{'PBROOT'}/pbconf" if ( not -d "$ENV{'PBROOT'}/pbconf");
+$ENV{'PBCONF'} = "$ENV{'PBROOT'}/pbconf";
+die "Project $ENV{'PBPROJ'} not ProjectBuild compliant. Please populate $ENV{'PBCONF'}" if ( not -d "$ENV{'PBCONF'}");
 
 #
 # Get global VERSION
 #
-open(VER, "$ENV{'PBROOT'}/pbconf/VERSION") || die "Unable to open $ENV{'PBROOT'}/pbconf/VERSION: $?";
+open(VER, "$ENV{'PBCONF'}/VERSION") || die "Unable to open $ENV{'PBCONF'}/VERSION: $?";
 $ver = <VER>;
 chomp($ver);
@@ -73 +74 @@
 #Get global TAG
 #
-open(TAG, "$ENV{'PBROOT'}/pbconf/TAG") || die "Unable to open $ENV{'PBROOT'}/pbconf/TAG: $?";
+open(TAG, "$ENV{'PBCONF'}/TAG") || die "Unable to open $ENV{'PBCONF'}/TAG: $?";
 $tag = <TAG>;
 chomp($tag);

devel/pb/lib/distro.pm

@@ -1 @@
-#!/bin/bash
+#!/usr/bin/perl -w
 #
-# Create env depending on the distro on which we are
+# Creates common environment for distributions
 #
 # $Id$
 #
-# Input parameters : $ddir (distro name) and $dver (distro version)
-# If they do not exist then deduce from current distro
-# Exports : $dfam (distro family) $suf (pkg suffix) $dtype (distro type) TOPBUILDDIR (dir to build packages) 
 
-#
-# Guess ddir and dver from the underlying distro
-#
-if [ _"$ddir" = _"" ]; then
-    if [ -e /etc/mandriva-release ]; then
-        export ddir="mandriva"
-        export dver=`awk '{print $4}' /etc/mandriva-release`
-    elif [ -e /etc/mandrake-release ]; then
-        export ddir="mandrake"
-        export dver=`awk '{print $3}' /etc/mandrake-release`
-    elif [ -e /etc/redhat-release ]; then
-        grep -q Enterprise /etc/redhat-release
-        if [ $? -eq 0 ]; then
-            export ddir="rhel"
-            export dver=`awk '{print $7}' /etc/redhat-release`
-        elif grep -q Fedora /etc/redhat-release ; then
-            export ddir="fedora"
-            grep -qi core /etc/redhat-release
-            if [ $? -eq 0 ]; then
-                export dver=`awk '{print $4}' /etc/redhat-release`
-            else
-                export dver=`awk '{print $3}' /etc/redhat-release`
-            fi
-        elif grep -q CentOS /etc/redhat-release ; then
-            export ddir="centos"
-            export dver=`awk '{print $3}' /etc/redhat-release | cut -d. -f1`
-        else
-            export ddir="redhat"
-            export dver=`awk '{print $5}' /etc/redhat-release`
-        fi
-    elif [ -e /etc/SuSE-release ]; then
-        grep -q Enterprise /etc/SuSE-release
-        if [ $? -eq 0 ]; then
-            export ddir="sles"
-            export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
-        elif grep -q openSUSE /etc/SuSE-release ; then
-            export ddir="suse"
-            export dver=`head -1 /etc/SuSE-release | awk '{print $2}'`
-        else
-            export ddir="suse"
-            export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
-        fi
-    elif [ -e /etc/slackware-version ]; then
-        export ddir="slackware"
-        export dver=`awk '{print $2}' /etc/slackware-version | cut -d. -f1-2`
-    elif [ -e /etc/gentoo-release ]; then
-        export ddir="gentoo"
-        export dver=`awk '{print $5}' /etc/gentoo-release | cut -d. -f1-2`
-    elif [ -e /etc/debian_version ]; then
-        export ddir="debian"
-        export dver=`cat /etc/debian_version`
-        # Debian assigns release names only once a release actually happens.
-        # Debian does not distinguish between testing and unstable because
-        # unstable today is what testing will be in about ten days time. So,
-        # in case we encounter "tesing/unstable", we assume unstable, i.e. sid.
-        # Note that for released versions, the numeric version will be contained
-        # in debian_version, e.g. on a sarge system, the value will be '3.1'.
-        if [ $dver = "testing/unstable" ]; then
-            export dver = "sid"
-        fi
-        if [ -e /etc/lsb-release ]; then
-            grep -qi ubuntu /etc/lsb-release
-            if  [ $? -eq 0 ]; then
-                export ddir="ubuntu"
-                export dver=`cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2`
-            fi
-        fi
-    elif [ -e /etc/motd ]; then
-        head -1 /etc/motd | grep -q FreeBSD
-        if [ $? -eq 0 ]; then
-            export ddir="freebsd"
-            export dver=`head -1 /etc/motd | awk '{print $2}' /etc/motd | cut -d- -f1`
-        else
-            export ddir="unknown"
-            export dver=""
-        fi
-    else
-        export ddir="unknown"
-        export dver=""
-    fi
-fi
+require Exporter;
+@ISA = qw(Exporter);
+@EXPORT = qw(distro_init distro_get);
 
-#
-# Generate all other parameters
-#
-if [ $ddir = "debian" -o $ddir = "ubuntu" ]; then
-    dfam="debian"
-    dtype="deb"
-    suf=".${ddir}${dver}"
-elif [ $ddir = "gentoo" ]; then
-    dfam="gentoo"
-    dtype="ebuild"
-    dver1=`echo ${dver} | sed "s/\.//"`
-    suf=".${ddir}${dver1}"
-elif [ $ddir = "slackware" ]; then
-    dfam="slackware"
-    dtype="tgz"
-    suf=".${dfam}${dver}"
-elif [ $ddir = "sles" -o $ddir = "suse" ]; then
-    dfam="suse"
-    dtype="rpm"
-    suf=".${ddir}${dver}"
-elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" -o $ddir = "centos" ]; then
-    dfam="redhat"
-    dtype="rpm"
-    dver1=`echo ${dver} | sed "s/\.//"`
-    if [ $ddir = "fedora" ]; then
-        suf=".fc${dver1}"
-    elif [ $ddir = "centos" ]; then
-        dver1=`echo ${dver} | sed "s/\.[0-9]//"`
-        suf=".centos${dver1}"
-    elif [ $ddir = "redhat" ]; then
-        suf=".rh${dver1}"
-    else
-        suf=".rhel${dver1}"
-    fi
-elif [ $ddir = "mandrake" ]; then
-    dfam="mandriva"
-    dtype="rpm"
-    suf=".`echo $dver | sed 's/\.//'`mdk"
-elif [ $ddir = "mandriva" ]; then
-    dfam="mandriva"
-    dtype="rpm"
-    suf=".`echo $dver | sed 's/\.//'`mdv"
-elif [ $ddir = "freebsd" ]; then
-    dfam="freebsd"
-    dtype="port"
-    suf=".`echo $dver | sed 's/\.//'`fbsd"
-else
-    dfam="unknown"
-    dtype="unknown"
-    suf="unknown"
-fi
+use strict;
 
-export dfam
-export dtype
-export suf
+sub distro_init {
 
-#
-# Additional exports and preparation for some distros
-#
+my $ddir = shift;
+my $dver = shift;
+my $dfam = "unknown";
+my $dtype = "unknown";
+my $dsuf = "unknown";
 
-# Default
-export TOPBUILDDIR=${TOPDIR}/../build
+# If we don't know which distribution we're on, then guess it
+($ddir, $dver) = distro_get() if ((not defined $ddir) || (not defined $dver));
 
-if [ _"$dtype" = _"rpm" ]; then
-    export TOPBUILDDIR=`rpmquery --eval '%{_topdir}' 2> /dev/null`
-    export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
-    mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
-    if [ $? -ne 0 ]; then
-        echo "Please ensure that you can write into ${TOPBUILDDIR}"
-        echo "Solution: setup _topdir in your ~/.rpmmacros or"
-        echo "chown the ${TOPBUILDDIR} to your uid"
-        exit -1
-    fi
-elif [ _"$dtype" = _"deb" ]; then
-    mkdir -p ${TOPBUILDDIR}
-elif [ _"$dtype" = _"port" ]; then
-    mkdir -p ${TOPBUILDDIR}
-elif [ _"$dfam" = _"slackware" ]; then
-    mkdir -p ${TOPBUILDDIR}/install
-elif [ _"$dtype" = _"ebuild" ]; then
-    mkdir -p ${TOPBUILDDIR}/portage
-fi
+if (($ddir =~ /debian/) ||
+    ($ddir =~ /ubuntu/)) {
+    $dfam="debian";
+    $dtype="deb";
+    $dsuf=".$ddir$dver";
+} elsif ($ddir =~ /gentoo/) {
+    $dfam="gentoo";
+    $dtype="ebuild";
+    my $dver1 = $dver;
+    $dver1 =~ s/\.//;
+    $dsuf=".$ddir$dver1";
+} elsif ($ddir =~ /slackware/) {
+    $dfam="slackware";
+    $dtype="tgz";
+    $dsuf=".$dfam$dver";
+} elsif (($ddir =~ /suse/) ||
+        ($ddir =~ /sles/)) {
+    $dfam="suse";
+    $dtype="rpm";
+    $dsuf=".$ddir$dver";
+} elsif (($ddir =~ /redhat/) ||
+        ($ddir =~ /rhel/) ||
+        ($ddir =~ /fedora/) ||
+        ($ddir =~ /centos/)) {
+    $dfam="redhat";
+    $dtype="rpm";
+    my $dver1 = $dver;
+    $dver1 =~ s/\.//;
+    if ($ddir =~ /fedora/) {
+        $dsuf=".fc$dver1";
+    } elsif ($ddir =~ /redhat/) {
+        $dsuf=".rh$dver1";
+    } else {
+        $dsuf=".$ddir$dver1";
+    }
+} elsif (($ddir =~ /mandrake/) ||
+        ($ddir =~ /mandriva/)) {
+    $dfam="mandriva";
+    $dtype="rpm";
+    if ($ddir =~ /mandrake/) {
+        my $dver1 = $dver;
+        $dver1 =~ s/\.//;
+        $dsuf=".mdk$dver1";
+    } else {
+        $dsuf=".mdv$dver";
+    }
+} elsif ($ddir =~ /freebsd/) {
+    $dfam="freebsd";
+    $dtype="port";
+    my $dver1 = $dver;
+    $dver1 =~ s/\.//;
+    $dsuf=".$dfam$dver1";
+} else {
+    $dfam="unknown";
+    $dtype="unknown";
+    $dsuf="unknown";
+}
+
+return($ddir, $dver, $dfam, $dtype, $dsuf);
+}
+
+sub distro_get {
+}
+1;