Changeset 21 in ProjectBuilder for devel/pb/bin

Timestamp:

Jul 31, 2007, 11:52:24 AM (17 years ago)

Author:

Bruno Cornec

Message:

Add syntax, control of traces, debug level ...
Much Nicer output now

File:

• devel/pb/bin/pb.pl (modified) (17 diffs)

devel/pb/bin/pb.pl

@@ -21 +21 @@
 use POSIX qw(strftime);
 
-use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles);
+use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles $debug);
 %extpkgdir = ();
 %filteredfiles = ();
+$debug = 0;                 # Debug level
 use lib qw (lib);
 use common qw (env_init);
@@ -42 +43 @@
 my $pbdate = strftime("%Y-%m-%d", @date);
 
-getopts('p:t',\%opts);
-
+getopts('hp:qtv',\%opts);
+
+if (defined $opts{'h'}) {
+    syntax();
+    exit(0);
+}
+if (defined $opts{'v'}) {
+    $debug++;
+}
+if (defined $opts{'q'}) {
+    $debug=-1;
+}
 # Handles project name if any
 if (defined $opts{'p'}) {
@@ -59 +70 @@
 # 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 "Project $ENV{'PBPROJ'}\n" if ($debug >= 0);
+print "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]) {
@@ -81 +91 @@
         @pkgs = @ARGV;
     }
-    print "Packages:\n";
-    print Dumper(@pkgs);
+    print "Packages: ".join(',',@pkgs)."\n" if ($debug >= 0);
     cms_init();
 
@@ -105 +114 @@
         }
         $pbrev = $ENV{'PBREVISION'};
-        print "Management of $pkg $pbver-$pbtag (rev $pbrev)\n";
+        print "\n" if ($debug >= 0);
+        print "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
@@ -114 +124 @@
         # And generate some additional files
         $OUTPUT_AUTOFLUSH=1;
-        print "$ENV{'PBCMSEXP'} of $pkg...";
+        print "$ENV{'PBCMSEXP'} of $pkg..." if ($debug >= 0);
         # computes in which dir we have to work
         my $dir = $defpkgdir{$pkg};
@@ -120 +130 @@
         system("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null");
         if ($? == -1) {
-            print "failed to execute: $!\n";
+            print "failed to execute: $!\n" if ($debug >= 0);
         } elsif ($? & 127) {
-            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
-        } else {
-            print " Done under $dest\n";
+            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+        } else {
+            print " OK\n" if ($debug >= 0);
         }
 
@@ -134 +144 @@
         # Extract cms log history and store it
         system("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}");
-        print "$ENV{'PBCMSLOG'} of $pkg...";
+        print "$ENV{'PBCMSLOG'} of $pkg..." if ($debug >= 0);
         if ($? == -1) {
-            print "failed to execute: $!\n";
+            print "failed to execute: $!\n" if ($debug >= 0);
         } elsif ($? & 127) {
-            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
-        } else {
-            print " OK\n";
-        }
+            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+        } else {
+            print " OK\n" if ($debug >= 0);
+        }
+        my %build;
         open(D,"$ENV{'PBCONF'}/DISTROS") || die "Unable to find $ENV{'PBCONF'}/DISTROS\n";
         while (<D>) {
@@ -147 +158 @@
             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 "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);
 
             # Filter build files from the less precise up to the most with overloading
@@ -157 +167 @@
             # Find all build files first relatively to PBROOT
             my %bfiles;
-            #print "dir: $ENV{'PBCONF'}/$pkg\n";
+            print "DEBUG dir: $ENV{'PBCONF'}/$pkg\n" if ($debug >= 1);
+            $build{"$ddir-$dver"} = "yes";
             if (-d "$ENV{'PBCONF'}/$pkg/$dtype") {
                 opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$dtype" || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$dtype: $!");
@@ -191 +202 @@
                 closedir(BDIR);
             } else {
-                print "No Build Files found for $ddir-$dver\n";
+                $build{"$ddir-$dver"} = "no";
                 next;
             }
-            print "bfiles: ".Dumper(\%bfiles)."\n";
+            print "DEBUG bfiles: ".Dumper(\%bfiles)."\n" if ($debug >= 1);
 
             # Get all filters to apply
@@ -222 +233 @@
             my $ptr;
             if (@ffiles) {
-                print "ffiles: ".Dumper(\@ffiles)."\n";
+                print "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
                 $config->file(@ffiles);
                 $ptr = $config->get("filter");
-                print "f:".Dumper($ptr)."\n";
+                print "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
             } else {
                 $ptr = { };
@@ -242 +253 @@
             }
         }
+        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 "Build files generated for ".join(',',@found)."\n";
+            print "No Build files found for ".join(',',@notfound)."\n";
+        }
         close(D);
         # Prepare the dest directory for archive
@@ -247 +268 @@
             system("cd $dest ; $ENV{'PBCONF'}/$pkg/pbinit");
             if ($? == -1) {
-                print "failed to execute: $!\n";
+                print "failed to execute: $!\n" if ($debug >= 0);
             } elsif ($? & 127) {
-                printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
+                printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
             } else {
-                print " $dest\n";
+                print " $dest\n" if ($debug >= 0);
             }
         }
         # Archive dest dir
         chdir "$dest/..";
-        print "Creating $pkg tar files (gzip... ";
+        print "Creating $pkg tar files (gzip... " if ($debug >= 0);
         system("tar cfphz $pkg-$pbver.tar.gz $pkg-$pbver");
         if ($? == -1) {
-            print "failed to execute: $!\n";
+            print "failed to execute: $!\n" if ($debug >= 0);
         } 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";
+            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);
         }
     }
 } else {
     print "'$action' is not available\n";
-    print "Available actions are:\n";
-    print "    cms2build\n";
+    syntax();
 }
 
@@ -284 +304 @@
 my $dsuf=shift;
 
-print "From $f to $destfile\n";
+print "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 +312 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        #print "debug: $filter{$s}\n";
+        print "DEBUG filter{$s}: $filter{$s}\n" if ($debug > 1);
         my $tmp = $filter{$s};
         next if (not defined $tmp);
@@ -312 +332 @@
 close(DEST);
 }
+
+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 "\n";
+    print "\tbuild2pkg: Create packages for your running distribution  \n";
+    print "\n";
+    print "\n";
+}