Changeset 22

Timestamp:

07/31/07 13:11:01 (6 years ago)

Author:

bruno

Message:

Begin to work on pkg2build
Cope the module Linux::Distribution in the project as it's not packages for my distro
Will make delivery much easier.

Location:

devel/pb

Files:

• bin/pb.pl (modified) (18 diffs)
• lib/LinuxDistribution.pm (added)
• lib/distro.pm (modified) (3 diffs)
• lib/pb.pm (modified) (1 diff)

devel/pb/bin/pb.pl

@@ -8 +8 @@
 # Provided under the GPL v2
 
-# Syntax: pb [-p project] <action> [<params>...]
+# Syntax: see at end
 
 use strict 'vars';
-use Switch;
 use Getopt::Std;
 use Data::Dumper;
@@ -17 +16 @@
 use AppConfig qw(:argcount :expand);
 use File::Basename;
-use Archive::Tar;
 use Time::localtime qw(localtime);
 use POSIX qw(strftime);
 
-use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles $debug);
+use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles $debug $LOG);
 %extpkgdir = ();
 %filteredfiles = ();
 $debug = 0;                 # Debug level
+$LOG = *STDOUT;             # Where to log
 use lib qw (lib);
 use common qw (env_init);
@@ -43 +42 @@
 my $pbdate = strftime("%Y-%m-%d", @date);
 
-getopts('hp:qtv',\%opts);
+getopts('hl:p:qtv',\%opts);
 
 if (defined $opts{'h'}) {
@@ -55 +54 @@
     $debug=-1;
 }
+if (defined $opts{'l'}) {
+    open(LOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
+    $LOG = *LOG;
+    $debug = 0  if ($debug == -1);
+    }
 # Handles project name if any
 if (defined $opts{'p'}) {
@@ -72 +76 @@
 die syntax() if (not defined $action);
 
-print "Project $ENV{'PBPROJ'}\n" if ($debug >= 0);
-print "Action: $action\n" if ($debug >= 0);
+print $LOG "Project $ENV{'PBPROJ'}\n" if ($debug >= 0);
+print $LOG "Action: $action\n" if ($debug >= 0);
 
 # Act depending on action
 if ($action =~ /^cms2build$/) {
-    # Get packages list
-    if (not defined $ARGV[0]) {
-        @pkgs = keys %defpkgdir;
-    } elsif ($ARGV[0] =~ /^all$/) {
-        @pkgs = keys %defpkgdir;
-        if (defined %extpkgdir) {
-            my $k = keys %extpkgdir;
-            if (defined $k) {
-                push(@pkgs, keys %extpkgdir);
-            }
-        }
-    } else {
-        @pkgs = @ARGV;
-    }
-    print "Packages: ".join(',',@pkgs)."\n" if ($debug >= 0);
+    my $ptr = get_pkg();
+    @pkgs = @$ptr;
     cms_init();
 
     foreach my $pkg (@pkgs) {
-
         if (-f "$ENV{'PBROOT'}/$pkg/VERSION") {
             open(V,"$ENV{'PBROOT'}/$pkg/VERSION") || die "Unable to open $ENV{'PBROOT'}/$pkg/VERSION";
@@ -114 +104 @@
         }
         $pbrev = $ENV{'PBREVISION'};
-        print "\n" if ($debug >= 0);
-        print "Management of $pkg $pbver-$pbtag (rev $pbrev)\n" if ($debug >= 0);
+        print $LOG "\n" if ($debug >= 0);
+        print $LOG "Management of $pkg $pbver-$pbtag (rev $pbrev)\n" if ($debug >= 0);
         die "Unable to get env var PBDESTDIR" if (not defined $ENV{'PBDESTDIR'});
         # Clean up dest if necessary. The export will recreate it
@@ -124 +114 @@
         # And generate some additional files
         $OUTPUT_AUTOFLUSH=1;
-        print "$ENV{'PBCMSEXP'} of $pkg..." if ($debug >= 0);
+        print $LOG "$ENV{'PBCMSEXP'} of $pkg..." if ($debug >= 0);
         # computes in which dir we have to work
         my $dir = $defpkgdir{$pkg};
@@ -130 +120 @@
         system("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null");
         if ($? == -1) {
-            print "failed to execute: $!\n" if ($debug >= 0);
+            print $LOG "failed to execute: $!\n" if ($debug >= 0);
         } elsif ($? & 127) {
-            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
-        } else {
-            print " OK\n" if ($debug >= 0);
+            printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+        } else {
+            print $LOG " OK\n" if ($debug >= 0);
         }
 
@@ -144 +134 @@
         # Extract cms log history and store it
         system("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}");
-        print "$ENV{'PBCMSLOG'} of $pkg..." if ($debug >= 0);
+        print $LOG "$ENV{'PBCMSLOG'} of $pkg..." if ($debug >= 0);
         if ($? == -1) {
-            print "failed to execute: $!\n" if ($debug >= 0);
+            print $LOG "failed to execute: $!\n" if ($debug >= 0);
         } elsif ($? & 127) {
-            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
-        } else {
-            print " OK\n" if ($debug >= 0);
+            printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+        } else {
+            print $LOG " OK\n" if ($debug >= 0);
         }
         my %build;
@@ -159 +149 @@
             chomp($ver);
             my ($ddir, $dver, $dfam, $dtype, $dsuf) = distro_init($dir,$ver);
-            print "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $dsuf)."\n" if ($debug >= 1);
-            print "DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n" if ($debug >= 1);
+            print $LOG "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $dsuf)."\n" if ($debug >= 1);
+            print $LOG "DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n" if ($debug >= 1);
 
             # Filter build files from the less precise up to the most with overloading
@@ -167 +157 @@
             # Find all build files first relatively to PBROOT
             my %bfiles;
-            print "DEBUG dir: $ENV{'PBCONF'}/$pkg\n" if ($debug >= 1);
+            print $LOG "DEBUG dir: $ENV{'PBCONF'}/$pkg\n" if ($debug >= 1);
             $build{"$ddir-$dver"} = "yes";
             if (-d "$ENV{'PBCONF'}/$pkg/$dtype") {
@@ -205 +195 @@
                 next;
             }
-            print "DEBUG bfiles: ".Dumper(\%bfiles)."\n" if ($debug >= 1);
+            print $LOG "DEBUG bfiles: ".Dumper(\%bfiles)."\n" if ($debug >= 1);
 
             # Get all filters to apply
@@ -233 +223 @@
             my $ptr;
             if (@ffiles) {
-                print "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
+                print $LOG "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
                 $config->file(@ffiles);
                 $ptr = $config->get("filter");
-                print "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
+                print $LOG "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
             } else {
                 $ptr = { };
@@ -260 +250 @@
                 push @notfound,$b if ($build{$b} =~ /no/);
             }
-            print "Build files generated for ".join(',',@found)."\n";
-            print "No Build files found for ".join(',',@notfound)."\n";
+            print $LOG "Build files generated for ".join(',',@found)."\n";
+            print $LOG "No Build files found for ".join(',',@notfound)."\n";
         }
         close(D);
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBCONF'}/$pkg/pbpkginit") {
+            print $LOG " Executing $ENV{'PBCONF'}/$pkg/pbinit...\n" if ($debug >= 0);
             system("cd $dest ; $ENV{'PBCONF'}/$pkg/pbinit");
             if ($? == -1) {
-                print "failed to execute: $!\n" if ($debug >= 0);
+                print $LOG "failed to execute: $!\n" if ($debug >= 0);
             } elsif ($? & 127) {
-                printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+                printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
             } else {
-                print " $dest\n" if ($debug >= 0);
+                print $LOG " OK\n" if ($debug >= 0);
             }
         }
         # Archive dest dir
-        chdir "$dest/..";
-        print "Creating $pkg tar files (gzip... " if ($debug >= 0);
+        chdir "$ENV{'PBDESTDIR'}";
+        print $LOG "Creating $pkg tar files (gzip... " if ($debug >= 0);
         system("tar cfphz $pkg-$pbver.tar.gz $pkg-$pbver");
         if ($? == -1) {
-            print "failed to execute: $!\n" if ($debug >= 0);
+            print $LOG "failed to execute: $!\n" if ($debug >= 0);
         } elsif ($? & 127) {
-            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
-        } else {
-            print " OK)\n" if ($debug >= 0);
-            print "Under $dest/../$pkg-$pbver.tar.gz\n" if ($debug >= 0);
-        }
+            printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+        } else {
+            print $LOG " OK)\n" if ($debug >= 0);
+            print $LOG "Under $ENV{'PBDESTDIR'}/$pkg-$pbver.tar.gz\n" if ($debug >= 0);
+            # Keep track of what is generated for build2pkg default
+            open(LAST,"> $ENV{'PBDESTDIR'}/LAST") || die "Unable to create $ENV{'PBDESTDIR'}/LAST";
+            print LAST "$pbver-$pbtag\n";
+            close(LAST);
+        }
+    }
+} elsif ($action =~ /^build2pkg$/) {
+    # Check whether we have a specific version to build
+    my $vertag = shift @ARGV;
+    if (not defined $vertag) {
+        open(LAST,"$ENV{'PBDESTDIR'}/LAST") || die "Unable to open $ENV{'PBDESTDIR'}/LAST\nYou may want to precise as parameter version-tag";
+        $vertag = <LAST>;
+        chomp($vertag);
+        close(LAST);
+    }
+    ($pbver,$pbtag) = split(/-/,$vertag);
+
+    # Get list of packages to build
+    my $ptr = get_pkg();
+    @pkgs = @$ptr;
+
+    # Get the running distro to build on
+
+    foreach my $pkg (@pkgs) {
     }
 } else {
-    print "'$action' is not available\n";
+    print $LOG "'$action' is not available\n";
     syntax();
 }
@@ -304 +318 @@
 my $dsuf=shift;
 
-print "DEBUG: From $f to $destfile\n" if ($debug >= 1);
+print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
 pbmkdir_p(dirname($destfile)) if (! -d dirname($destfile));
 open(DEST,"> $destfile") || die "Unable to create $destfile";
@@ -312 +326 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        print "DEBUG filter{$s}: $filter{$s}\n" if ($debug > 1);
+        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug > 1);
         my $tmp = $filter{$s};
         next if (not defined $tmp);
@@ -333 +347 @@
 }
 
+sub get_pkg {
+
+my @pkgs;
+
+# Get packages list
+if (not defined $ARGV[0]) {
+    @pkgs = keys %defpkgdir;
+} elsif ($ARGV[0] =~ /^all$/) {
+    @pkgs = keys %defpkgdir;
+    if (defined %extpkgdir) {
+        my $k = keys %extpkgdir;
+        if (defined $k) {
+            push(@pkgs, keys %extpkgdir);
+        }
+    }
+} else {
+    @pkgs = @ARGV;
+}
+print $LOG "Packages: ".join(',',@pkgs)."\n" if ($debug >= 0);
+return(\@pkgs);
+}
+
 sub syntax {
 
@@ -349 +385 @@
     print "\tcms2build: Create a tar file of the project under your CMS\n";
     print "\t           CMS supported are SVN and CVS\n";
+    print "\t           parameters are packages to build\n";
+    print "\t           if not using default list\n";
     print "\n";
     print "\tbuild2pkg: Create packages for your running distribution  \n";
-    print "\n";
-    print "\n";
-}
+    print "\t           first parameter is version-tag to build\n";
+    print "\t           if not using default version-tag\n";
+    print "\t           following parameters are packages to build\n";
+    print "\t           if not using default list\n";
+    print "\n";
+    print "\n";
+}

devel/pb/lib/distro.pm

@@ -7 +7 @@
 
 use strict;
+use LinuxDistribution qw (distribution_name distribution_version);
 
 sub distro_init {
@@ -17 +18 @@
 
 # If we don't know which distribution we're on, then guess it
-($ddir, $dver) = distro_get() if ((not defined $ddir) || (not defined $dver));
+$ddir = distribution_name() if (not defined $ddir);
+$dver = distribution_version() if (not defined $dver);
 
 # There shold be unicity of names between ddir dfam and dtype
@@ -81 +83 @@
 return($ddir, $dver, $dfam, $dtype, $dsuf);
 }
-
-sub distro_get {
-}
 1;

devel/pb/lib/pb.pm

@@ -16 +16 @@
 my $trace;
 
-if ($debug >= 0) {
+if ($debug > 0) {
     $trace = 1;
 } else {