Changes in / [20:30] in ProjectBuilder

Location:

/devel

Files:

• pb/bin/pb.pl (modified) (17 diffs)
• pb/lib/changelog.pm (modified) (1 diff)
• pb/lib/common.pm (modified) (2 diffs)
• pb/lib/distro.pm (modified) (3 diffs)
• pb/lib/pb.pm (modified) (5 diffs)
• pbconf/pb.pb (modified) (1 diff)
• pbconf/projectbuilder/pbfilter/rh.pbf (modified) (1 diff)
• pbconf/projectbuilder/rpm/pb.spec (modified) (2 diffs)

/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 File::Copy;
 use Time::localtime qw(localtime);
 use POSIX qw(strftime);
 
-use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles);
+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);
@@ -42 +43 @@
 my $pbdate = strftime("%Y-%m-%d", @date);
 
-getopts('p:t',\%opts);
-
+getopts('hl:p:qtv',\%opts);
+
+if (defined $opts{'h'}) {
+    syntax();
+    exit(0);
+}
+if (defined $opts{'v'}) {
+    $debug++;
+}
+if (defined $opts{'q'}) {
+    $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'}) {
@@ -59 +75 @@
 # Get Action
 $action = shift @ARGV;
-die "Syntax: pb [-p project] <action> [<params>...]" if (not defined $action);
-
-print "Project $ENV{'PBPROJ'}\n";
-#print "Action: $action - ARGV:".Dumper(\@ARGV);
+die syntax() if (not defined $action);
+
+print $LOG "Project $ENV{'PBPROJ'}\n" if ($debug >= 0);
+print $LOG "Action: $action\n" if ($debug >= 0);
 
 # Act depending on action
 if ($action =~ /^cms2build$/) {
-    print "Action: cms2build\n";
-    # 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:\n";
-    print Dumper(@pkgs);
+    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";
+    foreach my $pbpkg (@pkgs) {
+        if (-f "$ENV{'PBROOT'}/$pbpkg/VERSION") {
+            open(V,"$ENV{'PBROOT'}/$pbpkg/VERSION") || die "Unable to open $ENV{'PBROOT'}/$pbpkg/VERSION";
             $pbver = <V>;
             chomp($pbver);
@@ -96 +96 @@
         }
 
-        if (-f "$ENV{'PBROOT'}/$pkg/TAG") {
-            open(T,"$ENV{'PBROOT'}/$pkg/TAG") || die "Unable to open $ENV{'PBROOT'}/$pkg/TAG";
+        if (-f "$ENV{'PBROOT'}/$pbpkg/TAG") {
+            open(T,"$ENV{'PBROOT'}/$pbpkg/TAG") || die "Unable to open $ENV{'PBROOT'}/$pbpkg/TAG";
             $pbtag = <T>;
             chomp($pbtag);
@@ -105 +105 @@
         }
         $pbrev = $ENV{'PBREVISION'};
-        print "Management of $pkg $pbver-$pbtag (rev $pbrev)\n";
+        print $LOG "\n" if ($debug >= 0);
+        print $LOG "Management of $pbpkg $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
-        my $dest = "$ENV{'PBDESTDIR'}/$pkg-$pbver";
+        my $dest = "$ENV{'PBDESTDIR'}/$pbpkg-$pbver";
         pbrm_rf($dest) if (-d $dest);
 
@@ -114 +115 @@
         # And generate some additional files
         $OUTPUT_AUTOFLUSH=1;
-        print "$ENV{'PBCMSEXP'} of $pkg...";
+
         # computes in which dir we have to work
-        my $dir = $defpkgdir{$pkg};
-        $dir = $extpkgdir{$pkg} if (not defined $dir);
-        system("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null");
-        if ($? == -1) {
-            print "failed to execute: $!\n";
-        } elsif ($? & 127) {
-            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
-        } else {
-            print " Done under $dest\n";
-        }
+        my $dir = $defpkgdir{$pbpkg};
+        $dir = $extpkgdir{$pbpkg} if (not defined $dir);
+        pbsystem("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null", "Exporting $ENV{'PBROOT'}/$dir");
 
         # Creates a REVISION file
@@ -133 +127 @@
 
         # Extract cms log history and store it
-        system("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}");
-        print "$ENV{'PBCMSLOG'} of $pkg...";
-        if ($? == -1) {
-            print "failed to execute: $!\n";
-        } elsif ($? & 127) {
-            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
-        } else {
-            print " OK\n";
-        }
+        pbsystem("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}", "Extracting log info");
+
+        my %build;
         open(D,"$ENV{'PBCONF'}/DISTROS") || die "Unable to find $ENV{'PBCONF'}/DISTROS\n";
         while (<D>) {
@@ -147 +135 @@
             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);
-            #print "Filtering DDD => $pbdate, TTT => $pbtag, RRR => $pbtag$dsuf, VVV => $pbver\n";
+            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
@@ -157 +144 @@
             # Find all build files first relatively to PBROOT
             my %bfiles;
-            #print "dir: $ENV{'PBCONF'}/$pkg\n";
-            if (-d "$ENV{'PBCONF'}/$pkg/$dtype") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$dtype" || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$dtype: $!");
+            print $LOG "DEBUG dir: $ENV{'PBCONF'}/$pbpkg\n" if ($debug >= 1);
+            $build{"$ddir-$dver"} = "yes";
+            if (-d "$ENV{'PBCONF'}/$pbpkg/$dtype") {
+                opendir(BDIR,"$ENV{'PBCONF'}/$pbpkg/$dtype") || die "Unable to open dir $ENV{'PBCONF'}/$pbpkg/$dtype: $!";
                 foreach my $f (readdir(BDIR)) {
                     next if ($f =~ /^\./);
-                    $bfiles{$f} = "$ENV{'PBCONF'}/$pkg/$dtype/$f";
+                    $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dtype/$f";
                     $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
                 }
                 closedir(BDIR);
-            } elsif (-d "$ENV{'PBCONF'}/$pkg/$dfam") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$dfam" || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$dfam: $!");
+            } elsif (-d "$ENV{'PBCONF'}/$pbpkg/$dfam") {
+                opendir(BDIR,"$ENV{'PBCONF'}/$pbpkg/$dfam") || die "Unable to open dir $ENV{'PBCONF'}/$pbpkg/$dfam: $!";
                 foreach my $f (readdir(BDIR)) {
                     next if ($f =~ /^\./);
-                    $bfiles{$f} = "$ENV{'PBCONF'}/$pkg/$dfam/$f";
+                    $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dfam/$f";
                     $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
                 }
                 closedir(BDIR);
-            } elsif (-d "$ENV{'PBCONF'}/$pkg/$ddir") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$ddir" || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$ddir: $!");
+            } elsif (-d "$ENV{'PBCONF'}/$pbpkg/$ddir") {
+                opendir(BDIR,"$ENV{'PBCONF'}/$pbpkg/$ddir") || die "Unable to open dir $ENV{'PBCONF'}/$pbpkg/$ddir: $!";
                 foreach my $f (readdir(BDIR)) {
                     next if ($f =~ /^\./);
-                    $bfiles{$f} = "$ENV{'PBCONF'}/$pkg/$ddir/$f";
+                    $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir/$f";
                     $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
                 }
                 closedir(BDIR);
-            } elsif (-d "$ENV{'PBCONF'}/$pkg/$ddir-$dver") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$ddir-$dver" || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$ddir-$dver: $!");
+            } elsif (-d "$ENV{'PBCONF'}/$pbpkg/$ddir-$dver") {
+                opendir(BDIR,"$ENV{'PBCONF'}/$pbpkg/$ddir-$dver") || die "Unable to open dir $ENV{'PBCONF'}/$pbpkg/$ddir-$dver: $!";
                 foreach my $f (readdir(BDIR)) {
                     next if ($f =~ /^\./);
-                    $bfiles{$f} = "$ENV{'PBCONF'}/$pkg/$ddir-$dver/$f";
+                    $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir-$dver/$f";
                     $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
                 }
                 closedir(BDIR);
             } else {
-                print "No Build Files found for $ddir-$dver\n";
+                $build{"$ddir-$dver"} = "no";
                 next;
             }
-            print "bfiles: ".Dumper(\%bfiles)."\n";
+            print $LOG "DEBUG bfiles: ".Dumper(\%bfiles)."\n" if ($debug >= 1);
 
             # Get all filters to apply
@@ -201 +189 @@
             my @ffiles;
             my ($ffile0, $ffile1, $ffile2, $ffile3);
-            if (-d "$ENV{'PBCONF'}/$pkg/pbfilter") {
-                $ffile0 = "$ENV{'PBCONF'}/$pkg/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/$pkg/pbfilter/$dtype.pbf");
-                $ffile1 = "$ENV{'PBCONF'}/$pkg/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/$pkg/pbfilter/$dfam.pbf");
-                $ffile2 = "$ENV{'PBCONF'}/$pkg/pbfilter/$ddir.pbf" if (-f "$ENV{'PBCONF'}/$pkg/pbfilter/$ddir.pbf");
-                $ffile3 = "$ENV{'PBCONF'}/$pkg/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/$pkg/pbfilter/$ddir-$dver.pbf");
+            if (-d "$ENV{'PBCONF'}/$pbpkg/pbfilter") {
+                $ffile0 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dtype.pbf");
+                $ffile1 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dfam.pbf");
+                $ffile2 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir.pbf");
+                $ffile3 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir-$dver.pbf");
                 push @ffiles,$ffile0 if (defined $ffile0);
                 push @ffiles,$ffile1 if (defined $ffile1);
@@ -222 +210 @@
             my $ptr;
             if (@ffiles) {
-                print "ffiles: ".Dumper(\@ffiles)."\n";
+                print $LOG "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
                 $config->file(@ffiles);
                 $ptr = $config->get("filter");
-                print "f:".Dumper($ptr)."\n";
+                print $LOG "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
             } else {
                 $ptr = { };
@@ -235 +223 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles) {
-                    filter_file($f,$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$pkg,$dtype,$dsuf);
+                    filter_file($f,$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$pbpkg,$dtype,$dsuf);
                 }
                 foreach my $f (keys %filteredfiles) {
-                    filter_file($f,$ptr,"$dest/$f",$pkg,$dtype,$dsuf);
-                }
-            }
+                    filter_file($f,$ptr,"$dest/$f",$pbpkg,$dtype,$dsuf);
+                }
+            }
+        }
+        if ($debug >= 0) {
+            my @found;
+            my @notfound;
+            foreach my $b (keys %build) {
+                push @found,$b if ($build{$b} =~ /yes/);
+                push @notfound,$b if ($build{$b} =~ /no/);
+            }
+            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") {
-            system("cd $dest ; $ENV{'PBCONF'}/$pkg/pbinit");
-            if ($? == -1) {
-                print "failed to execute: $!\n";
-            } elsif ($? & 127) {
-                printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
-            } else {
-                print " $dest\n";
-            }
-        }
+        if (-x "$ENV{'PBCONF'}/$pbpkg/pbpkginit") {
+            pbsystem("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit","Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit");
+        }
+
         # Archive dest dir
-        chdir "$dest/..";
-        print "Creating $pkg tar files (gzip... ";
-        system("tar cfphz $pkg-$pbver.tar.gz $pkg-$pbver");
+        chdir "$ENV{'PBDESTDIR'}";
+        # Possibility to look at PBSRC to guess more the filename
+        pbsystem("tar cfphz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
         if ($? == -1) {
-            print "failed to execute: $!\n";
+            print $LOG "failed to execute: $!\n" if ($debug >= 0);
         } elsif ($? & 127) {
-            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
+            printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
         } else {
-            print " OK)\n";
-            print "Under $dest/../$pkg-$pbver.tar.gz\n";
+            print $LOG " OK)\n" if ($debug >= 0);
+            print $LOG "Under $ENV{'PBDESTDIR'}/$pbpkg-$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
+    my ($ddir, $dver, $dfam, $dtype, $dsuf) = distro_init();
+    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
+
+    chdir "$ENV{'PBBUILDDIR'}";
+    foreach my $pbpkg (@pkgs) {
+        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+        print $LOG "Handling source file $src\n" if ($debug >= 0);
+
+        if ($dtype eq "rpm") {
+            # rpm has its own standard build directory
+            my $tmp=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
+            chomp($tmp);
+            $ENV{'PBBUILDDIR'}=$tmp;
+            print $LOG "Working under $ENV{'PBBUILDDIR'}\n" if ($debug >= 0);
+            foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
+                if (! -d "$ENV{'PBBUILDDIR'}/$d") {
+                pbmkdir_p("$ENV{'PBBUILDDIR'}/$d") || die "Please ensure that you can write into $ENV{'PBBUILDDIR'} to create $d\nSolution: setup _topdir in your ~/.rpmmacros or\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
+                }
+            }
+
+            # We need to first extract the spec file
+            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
+            my @specfile;
+            @specfile = extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
+
+            print $LOG "specfile: ".Dumper(\@specfile)."\n" if ($debug >= 1);
+            # set LANGUAGE to check for correct log messages
+            $ENV{'LANGUAGE'}="C";
+            #system("ls -R $ENV{'PBBUILDDIR'}") if ($debug >= 1);
+            foreach my $f (@specfile) {
+                if ($f =~ /\.spec$/) {
+                    pbsystem("rpmbuild -ba $f","Building package with $f");
+                    last;
+                }
+            }
+        } elsif ($dtype eq "tgz") {
+            pbmkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
+        } elsif ($dtype eq "ebuild") {
+            pbmkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
+        } else {
         }
     }
 } else {
-    print "'$action' is not available\n";
-    print "Available actions are:\n";
-    print "    cms2build\n";
+    print $LOG "'$action' is not available\n";
+    syntax();
 }
 
@@ -280 +333 @@
 my %filter=%$ptr;
 my $destfile=shift;
-my $pkg=shift;
+my $pbpkg=shift;
 my $dtype=shift;
 my $dsuf=shift;
 
-print "From $f to $destfile\n";
+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";
@@ -292 +345 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        #print "debug: $filter{$s}\n";
+        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug > 1);
         my $tmp = $filter{$s};
         next if (not defined $tmp);
@@ -300 +353 @@
         # special case for ChangeLog
         } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
-            my $p = $defpkgdir{$pkg};
-            $p = $extpkgdir{$pkg} if (not defined $p);
-            changelog($dtype, $pkg, $pbtag, $dsuf, $p, \*DEST);
+            my $p = $defpkgdir{$pbpkg};
+            $p = $extpkgdir{$pbpkg} if (not defined $p);
+            changelog($dtype, $pbpkg, $pbtag, $dsuf, $p, \*DEST);
             $tmp = "";
         }
@@ -312 +365 @@
 close(DEST);
 }
+
+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 extract_build_files {
+
+my $src=shift;
+my $dir=shift;
+my $ddir=shift;
+my @files;
+
+pbsystem("tar xfz $src $dir >/dev/null","Extracting build files");
+opendir(DIR,"$dir") || die "Unable to open directory $dir";
+foreach my $f (readdir(DIR)) {
+    next if ($f =~ /^\./);
+    move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir";
+    print $LOG "mv $dir/$f $ddir\n" if ($debug >= 1);
+    push @files,"$ddir/$f";
+}
+closedir(DIR);
+# Not enough but still a first cleanup
+pbrm_rf("$dir");
+return(@files);
+}
+
+sub syntax {
+
+    print "Syntax: pb [-vhqt][-p project] <action> [<params>...]\n";
+    print "\n";
+    print "-h : This help file\n";
+    print "-q : Quiet mode\n";
+    print "-t : Test mode (not done yet)\n";
+    print "-v : Verbose mode\n";
+    print "\n";
+    print "-p project : Name of the project you're working on\n";
+    print "             (or use the env variable PBPROJ)     \n";
+    print "\n";
+    print "<action> can be:\n";
+    print "\n";
+    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 "\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/changelog.pm

@@ -34 +34 @@
 my $chglog = "$ENV{'PBROOT'}/$path/ChangeLog";
 if (! -f $chglog) {
-    print "Unable to find the ChangeLog file ($chglog) for $pkg\n";
+    print "Unable to find the ChangeLog file ($chglog) for $pkg\n" if ($debug >= 0);
     return("\n");
 }

/devel/pb/lib/common.pm

@@ -89 +89 @@
 # Set delivery directory
 #
-$ENV{'PBTOPDIR'}="$ENV{'PBROOT'}/../delivery";
+chdir "$ENV{'PBROOT'}/..";
+my $path = `pwd`;
+chomp($path);
+$ENV{'PBTOPDIR'}=$path."/delivery";
 $ENV{'PBDESTDIR'}="$ENV{'PBTOPDIR'}/$ENV{'PBVER'}-$ENV{'PBTAG'}";
-pbrm_rf($ENV{'PBDESTDIR'}) if (-d "$ENV{'PBDESTDIR'}");
-pbmkdir_p($ENV{'PBDESTDIR'}) || die "Unable to recursively create $ENV{'PBDESTDIR'}";
+if (-d $ENV{'PBDESTDIR'}) {
+    opendir(DIR,$ENV{'PBDESTDIR'}) || die "Unable to open directory $ENV{'PBDESTDIR'}: $!";
+    foreach my $d (readdir(DIR)) {
+        next if ($d =~ /^\./);
+        pbrm_rf("$ENV{'PBDESTDIR'}/$d") if (-d "$ENV{'PBDESTDIR'}/$d");
+    }
+    closedir(DIR);
+}
+if (! -d "$ENV{'PBDESTDIR'}") {
+    pbmkdir_p($ENV{'PBDESTDIR'}) || die "Unable to recursively create $ENV{'PBDESTDIR'}";
+}
+
+#
+# Set build directory
+#
+$ENV{'PBBUILDDIR'}=$path."/build";
+pbrm_rf($ENV{'PBBUILDDIR'}) if (-d "$ENV{'PBBUILDDIR'}");
+pbmkdir_p($ENV{'PBBUILDDIR'}) || die "Unable to recursively create $ENV{'PBBUILDDIR'}";
 
 umask 0022;
@@ -99 +118 @@
 
 sub pbmkdir_p {
-    my @dir = @_;
-    my $ret = mkpath(@dir, 0, 0755);
-    return($ret);
+my @dir = @_;
+my $ret = mkpath(@dir, 0, 0755);
+return($ret);
 }
 
 sub pbrm_rf {
-    my @dir = @_;
-    my $ret = rmtree(@dir, 0, 0);
-    return($ret);
+my @dir = @_;
+my $ret = rmtree(@dir, 0, 0);
+return($ret);
 }
 
+sub pbsystem {
+
+my $cmd=shift;
+my $cmt=shift || $cmd;
+
+print $LOG "$cmt... ";
+system("$cmd");
+if ($? == -1) {
+    print $LOG "failed to execute: $!\n" if ($debug >= 0);
+} elsif ($? & 127) {
+    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);
+}
+}
 1;

/devel/pb/lib/distro.pm

@@ -10 +10 @@
 sub distro_init {
 
-my $ddir = shift;
-my $dver = shift;
+my $ddir = shift || undef;
+my $dver = shift || undef;
 my $dfam = "unknown";
 my $dtype = "unknown";
@@ -17 +17 @@
 
 # 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,$dver) = get_distro() if ((not defined $ddir) || (not defined $dver));
 
 # There shold be unicity of names between ddir dfam and dtype
@@ -82 +82 @@
 }
 
-sub distro_get {
+sub get_distro {
+
+# Cf: http://linuxmafia.com/faq/Admin/release-files.html
+# Ideas taken from 
+# http://search.cpan.org/~kerberus/Linux-Distribution-0.14/lib/Linux/Distribution.pm
+
+my $base="/etc";
+
+# List of files that unambiguously indicates what distro we have
+my %single_rel_files = (
+# Tested
+    'gentoo'            =>  'gentoo-release',       # >= 1.6
+    'debian'            =>  'debian_version',       # >= 3.1
+    'slackware'         =>  'slackware-version',    # >= 10.2
+    'mandriva'          =>  'mandriva-release',     # >=2006.0
+    'fedora'            =>  'fedora-release',       # >= 4
+    'sles'              =>  'sles-release',         # ???
+# 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
+    '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'],
+    'suse'              => ['suse', 'sles'],
+    'redhat'            => ['redhat', 'rhel', 'centos', 'mandrake'],
+    'lsb'               => ['ubuntu', 'debian', 'lsb'],
+    );
+
+my %distro_match = (
+# Tested
+    'gentoo'                => '.* version (.+)',
+    'debian'                => '([^/]+)[/]*.*',
+    'slackware'             => 'S[^ ]* (.+)$',
+# There should be no ambiguity between potential ambiguous distro
+    'mandrake'              => 'Mandr[^ ]* release (.+) \(',
+    'mandriva'              => 'Mandr[^ ]* [^ ]* release (.+) \(',
+    'fedora'                => 'Fedora .*release (\d+) \(',
+    'rhel'                  => 'Red Hat Enterprise Linux .*release (.+) \(',
+    'centos'                => '.*CentOS .*release (.+) ',
+    'redhat'                => 'Red Hat Linux release (.+) \(',
+    'sles'                  => '.* Enterprise .*\nVERSION = (.+)',
+    'suse'                  => '.* [^Enterpis] .*\nVERSION = (.+)',
+    'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',
+    'ubuntu'                => '.*Ubuntu.*\nDISTRIB_RELEASE=(.+)',
+# Not tested
+    'arch'                  => '.* ([0-9.]+) .*',
+    'redflag'               => 'Red Flag (?:Desktop|Linux) (?:release |\()(.*?)(?: \(.+)?\)',
+);
+
+my $release;
+my $distro;
+
+# Begin to test presence of non-amiguous files
+# 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=get_content("$base/$r");
+        # Found the only possibility. 
+        # Try to get version and return
+        if (defined ($distro_match{$d})) {
+            ($release) = $tmp =~ m/$distro_match{$d}/m;
+        } else {
+            print STDERR "Unable to find $d version in $r\n";
+            print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
+            $release = "unknown";
+        }
+        return($d,$release);
+    }
+}
+
+while (($d,$r) = each %ambiguous_rel_files) {
+    if (-f "$base/$r" && !-l "$base/$r"){
+        # Found one possibility. 
+        # Get all distros concerned by that file
+        my $tmp=get_content("$base/$r");
+        my $found = 0;
+        my $ptr = $distro_similar{$d};
+        print $LOG "amb: ".Dumper($ptr)."\n" if ($debug >= 1);
+        $release = "unknown";
+        foreach my $dd (@$ptr) {
+            print $LOG "check $dd\n" if ($debug >= 1);
+            # Try to check pattern
+            if (defined $distro_match{$dd}) {
+                print $LOG "cmp: $distro_match{$dd} - vs - $tmp\n" if ($debug >= 1);
+                ($release) = $tmp =~ m/$distro_match{$dd}/m;
+                if ((defined $release) && ($release ne "unknown")) {
+                    $distro = $dd;
+                    $found = 1;
+                    last;
+                }
+            }
+        }
+        if ($found == 0) {
+            print STDERR "Unable to find $d version in $r\n";
+            print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
+            $release = "unknown";
+        } else {
+            return($distro,$release);
+        }
+    }
+}
+return("unknown","unknown");
+}
+
+sub get_content {
+
+my $file=shift;
+
+my $bkp = $/;
+undef $/;
+open(R,$file) || die "Unable to open $file: $!";
+my $content=<R>;
+close(R);
+chomp($content);
+$/ = $bkp;
+return($content);
 }
 1;

/devel/pb/lib/pb.pm

@@ -14 +14 @@
 my $conffile = shift;
 my $ptr;
+my $trace;
+
+if ($debug > 0) {
+    $trace = 1;
+} else {
+    $trace = 0;
+}
 
 my $config = AppConfig->new({
                             # Auto Create variables mentioned in Conf file
                             CREATE => 1,
-                            DEBUG => 1,
+                            DEBUG => $trace,
                             GLOBAL => {
                                 # Each conf item is a hash
@@ -34 +41 @@
 $ptr = $config->get("confparam") || die "Unable to find confparam in $conffile";
 %confparam = %$ptr;
-print "confparam: ".Dumper($ptr)."\n";
+print "DEBUG: confparam: ".Dumper($ptr)."\n" if ($debug >= 1);
 
 # List of pkg to build by default (mandatory)
 $ptr = $config->get("defpkgdir") || die "Unable to find defpkgdir in $conffile";
 %defpkgdir = %$ptr;
-print "defpkgdir: ".Dumper($ptr)."\n";
+print "DEBUG: defpkgdir: ".Dumper($ptr)."\n" if ($debug >= 1);
 
 # List of additional pkg to build when all is called (optional)
 $ptr = $config->get("extpkgdir");
-print "extpkgdir1: ".Dumper($ptr)."\n";
+print "DEBUG: extpkgdir1: ".Dumper($ptr)."\n" if ($debug >= 1);
 if (not defined $ptr) {
     %extpkgdir = ();
@@ -49 +56 @@
     %extpkgdir = %$ptr;
 }
-print "extpkgdir: ".Dumper(\%extpkgdir)."\n";
+print "DEBUG: extpkgdir: ".Dumper(\%extpkgdir)."\n" if ($debug >= 1);
 
 # Valid version names (optional)
@@ -58 +65 @@
     %version = %$ptr;
 }
-print "version: ".Dumper(\%version)."\n";
+print "DEBUG: version: ".Dumper(\%version)."\n" if ($debug >= 1);
 
 # List of files to filter (optional)
@@ -67 +74 @@
     %filteredfiles = %$ptr;
 }
-print "filteredfiles: ".Dumper(\%filteredfiles)."\n";
+print "DEBUG: filteredfiles: ".Dumper(\%filteredfiles)."\n" if ($debug >= 1);
 
 }

/devel/pbconf/pb.pb

@@ -18 +18 @@
 
 # Hash of default package/package directory
-defpkgdir projectbuilder = pb
-defpkgdir projectbuilder-doc = pb-doc
+defpkgdir project-builder = pb
 
 # Hash of additional package/package directory
-#extpkgdir pkg1 = dir1
+extpkgdir project-builder-doc = pb-doc
 
 # Hash of valid version names

/devel/pbconf/projectbuilder/pbfilter/rh.pbf

@@ -27 +27 @@
 # PBREV is replaced by the revision ($pbrev in code)
 filter PBREV = $pbrev
+
+# PBPKG is replaced by the package name ($pbpkg in code)
+filter PBPKG = $pbpkg

/devel/pbconf/projectbuilder/rpm/pb.spec

@@ -6 +6 @@
 Summary(fr):    Project Builder ou pb est un programme pour produire des paquets pour diverses distributions
 
-Name:       pb
+Name:       PBPKG
 Version:    PBVER
 Release:    PBTAG
@@ -14 +14 @@
 Source:     PBSRC
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-BuildRequires:  
+BuildArch:  noarch
 Requires:   perl >= 5.8.8, PBDEP