Changeset 18

Timestamp:

07/31/07 00:50:36 (6 years ago)

Author:

bruno

Message:

cms2build roughly working

Location:

devel

Files:

• pb/bin/cms2build.pl (deleted)
• pb/bin/pb.pl (modified) (6 diffs)
• pb/lib/changelog.pm (modified) (4 diffs)
• pb/lib/cms.pm (modified) (1 diff)
• pb/lib/common.pm (modified) (2 diffs)
• pb/lib/distro.pm (modified) (1 diff)
• pb/lib/pb.pm (modified) (3 diffs)
• pb/lib/toolhome.pm (deleted)
• pbconf/pb.pb (modified) (1 diff)

devel/pb/bin/pb.pl

@@ -10 +10 @@
 # Syntax: pb [-p project] <action> [<params>...]
 
-use strict;
+use strict 'vars';
 use Switch;
 use Getopt::Std;
@@ -21 +21 @@
 use POSIX qw(strftime);
 
+use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles);
 use lib qw (lib);
-use vars qw (%defpkgdir %extpkgdir %version %param %filteredfiles);
 use common qw (env_init);
-use pb qw (defpkgdir extpkgdir version param filteredfiles pb_init);
+use pb qw (pb_init);
 use distro qw (distro_init);
 use cms;
@@ -70 +70 @@
     } elsif ($ARGV[0] =~ /^all$/) {
         @pkgs = keys %defpkgdir;
-        push(@pkgs, keys %extpkgdir);
+        if (defined %extpkgdir) {
+            my $k = keys %extpkgdir;
+            if (defined $k) {
+                push(@pkgs, keys %extpkgdir);
+            }
+        }
     } else {
         @pkgs = @ARGV;
@@ -231 +236 @@
                 }
             }
-            # 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";
-                }
-            }
-            # Archive dest dir
-            chdir "$dest/..";
-            print "Creating $pkg tar files (gzip... ";
-            system("tar cfphz $pkg-$pbver.tar.gz $pkg-$pbver");
+        }
+        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";
@@ -251 +246 @@
                 printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
             } else {
-                print " OK)\n";
-                print "Under $dest/../$pkg-$pbver.tar.gz\n";
-            }
-        }
-        close(D);
+                print " $dest\n";
+            }
+        }
+        # Archive dest dir
+        chdir "$dest/..";
+        print "Creating $pkg tar files (gzip... ";
+        system("tar cfphz $pkg-$pbver.tar.gz $pkg-$pbver");
+        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";
+            print "Under $dest/../$pkg-$pbver.tar.gz\n";
+        }
     }
 } else {
@@ -290 +295 @@
         # special case for ChangeLog
         } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/)) {
-            $tmp = changelog($dtype, $pkg, $pbtag, $dsuf, \*DEST);
+            my $p = $defpkgdir{$pkg};
+            $p = $extpkgdir{$pkg} if (not defined $p);
+            $tmp = changelog($dtype, $pkg, $pbtag, $dsuf, $p, \*DEST);
         }
         $line =~ s|$s|$tmp|;

devel/pb/lib/changelog.pm

@@ -17 +17 @@
 my $pbtag = shift;
 my $dsuf = shift;
+my $path = shift;
 my $OUTPUT = shift;
 
@@ -26 +27 @@
 return("\n") if ((not (defined $dtype)) || ($dtype eq "") || 
         (not (defined $pkg)) || ($pkg eq "") || 
+        (not (defined $pbtag)) || ($pbtag eq "") || 
+        (not (defined $dsuf)) || ($dsuf eq "") || 
+        (not (defined $path)) || ($path eq "") || 
         (not (defined $OUTPUT)) || ($OUTPUT eq ""));
 
-my $chglog = "$ENV{'PBROOT'}/$pkg/ChangeLog";
+my $chglog = "$ENV{'PBROOT'}/$path/ChangeLog";
 if (! -f $chglog) {
-    print "Unable to find a ChangeLog file for $pkg\n";
+    print "Unable to find the ChangeLog file ($chglog) for $pkg\n";
     return("\n");
 }
@@ -72 +76 @@
             $ver2 = "$ver$dsuf";
         }
-        print $OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver2\n";
+        print $OUTPUT "* $ndate $confparam{'packager'} $ver2\n";
         print $OUTPUT "- Updated to $ver\n";
         }
@@ -95 +99 @@
 
     if ($dtype eq "deb") {
-        print $OUTPUT " -- Bruno Cornec <bruno\@mondorescue.org>  $n2date\n\n";
+        print $OUTPUT " -- $confparam{'packager'} $n2date\n\n";
         print $OUTPUT "\n";
         }

devel/pb/lib/cms.pm

@@ -5 +5 @@
 # $Id$
 #
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(get_toolhome);
 
 use strict;

devel/pb/lib/common.pm

@@ -5 +5 @@
 # $Id$
 #
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(env_init);
 
+use strict;
 use lib qw (lib);
 use pb qw (pb_init);
-use strict;
 use File::Basename;
 use File::Path;
 use File::Temp qw /tempdir/;
-use vars qw (%defpkgdir %extpkgdir %version %param);
 use Data::Dumper;
 
@@ -43 +39 @@
 # Check content
 #
-if (not defined $param{"pbroot"}) {
-    die "param pbroot doesn't exist in $ENV{'PBETC'}/$proj.pb";
+if (not defined $confparam{"pbroot"}) {
+    die "confparam pbroot doesn't exist in $ENV{'PBETC'}/$proj.pb";
 } else {
-    $ENV{'PBROOT'} = $param{"pbroot"}; 
+    $ENV{'PBROOT'} = $confparam{"pbroot"}; 
 }
-if (defined $param{"cvsroot"}) {
-    $ENV{'CVSROOT'} = $param{"cvsroot"}; 
+if (defined $confparam{"cvsroot"}) {
+    $ENV{'CVSROOT'} = $confparam{"cvsroot"}; 
 }
 

devel/pb/lib/distro.pm

@@ -5 +5 @@
 # $Id$
 #
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(distro_init distro_get);
 
 use strict;

devel/pb/lib/pb.pm

@@ -1 +1 @@
 #!/usr/bin/perl -w
 #
-# Project Builder configuration file
+# Project Builder configuration file handler
 # For project pb ;-)
 #
@@ -7 +7 @@
 #
 use strict;
-use Exporter();
-use vars qw(@ISA @EXPORT_OK);
-@ISA = qw(Exporter);
-# global vars are here
-@EXPORT_OK = qw(%defpkgdir %extpkgdir %version %param %filteredfiles &pb_init);
-use vars @EXPORT_OK;
 use AppConfig qw(ARGCOUNT_HASH);
 
@@ -33 +27 @@
 # Root of the project to build
 # needs at least 2 levels of dir as in the upper 
-# other dirs will be created and used
-$ptr = $config->get("param");
-%param = %$ptr;
+# other dirs will be created and used 
 
-# List of pkg to build by default
+# main parameter hash (mandatory)
+$ptr = $config->get("confparam") || die "Unable to find confparam in $conffile";
+%confparam = %$ptr;
+
+# List of pkg to build by default (mandatory)
 $ptr = $config->get("defpkgdir") || die "Unable to find defpkgdir in $conffile";
 %defpkgdir = %$ptr;
 
-# List of additional pkg to build when all is called
+# List of additional pkg to build when all is called (optional)
 $ptr = $config->get("extpkgdir");
-%extpkgdir = %$ptr;
+if (not defined $ptr) {
+    %extpkgdir = ();
+} else {
+    %extpkgdir = %$ptr;
+}
 
-# Valid version names
+# Valid version names (optional)
 $ptr = $config->get("version");
-%version = %$ptr;
+if (not defined $ptr) {
+    %version = ();
+} else {
+    %version = %$ptr;
+}
 
-# List of files to filter
+# List of files to filter (optional)
 $ptr = $config->get("filteredfiles");
-%filteredfiles = %$ptr;
+if (not defined $ptr) {
+    %filteredfiles = ();
+} else {
+    %filteredfiles = %$ptr;
+}
 
 }

devel/pbconf/pb.pb

@@ -6 +6 @@
 #
 
-# param is a hash to ease interface
+# confparam is a hash to ease interface
 # Root directory of the pb project
-param pbroot = "/users/bruno/pb/svn/devel"
+confparam pbroot = "/users/bruno/pb/svn/devel"
 
 # Packager for ChangeLogs
-param packager = "Bruno Cornec <bruno\@mondorescue.org>"
+confparam packager = "Bruno Cornec <bruno\@mondorescue.org>"
 
 # If CVS give login method with CVSROOT
 #cvsroot = ":pserver:anonymous@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe"
-param cvsroot = " "
+confparam cvsroot = " "
 
 # Hash of default package/package directory