Changeset 19 in ProjectBuilder

Timestamp:

Jul 31, 2007, 2:07:14 AM (17 years ago)

Author:

Bruno Cornec

Message:

Lots of debug traces. Looking for a bug in AppConfig where for hash a key of 1 is added without defined value.
Except that, weems to work just fine (content to be checked)

Location:

devel/pb

Files:

• bin/pb.pl (modified) (2 diffs)
• lib/pb.pm (modified) (6 diffs)

devel/pb/bin/pb.pl

@@ -22 +22 @@
 
 use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles);
+%extpkgdir = ();
+%filteredfiles = ();
 use lib qw (lib);
 use common qw (env_init);
@@ -218 +220 @@
                             }
                         });
-            print "ffiles: ".Dumper(\@ffiles)."\n";
+            my $ptr;
             if (@ffiles) {
+                print "ffiles: ".Dumper(\@ffiles)."\n";
                 $config->file(@ffiles);
-                my $ptr = $config->get("filter");
+                $ptr = $config->get("filter");
                 print "f:".Dumper($ptr)."\n";
-
-                # Apply now all the filters on all the files concerned
-                # All files are relative to PBROOT
-                # destination dir depends on the type of file
-                if (defined $ptr) {
-                    foreach my $f (values %bfiles) {
-                        filter_file($f,$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$pkg,$dtype,$dsuf);
-                    }
-                    foreach my $f (keys %filteredfiles) {
-                        filter_file($f,$ptr,"$dest/$f",$pkg,$dtype,$dsuf);
-                    }
+            } else {
+                $ptr = { };
+            }
+
+            # Apply now all the filters on all the files concerned
+            # All files are relative to PBROOT
+            # destination dir depends on the type of file
+            if (defined $ptr) {
+                foreach my $f (values %bfiles) {
+                    filter_file($f,$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$pkg,$dtype,$dsuf);
+                }
+                foreach my $f (keys %filteredfiles) {
+                    filter_file($f,$ptr,"$dest/$f",$pkg,$dtype,$dsuf);
                 }
             }

devel/pb/lib/pb.pm

@@ -8 +8 @@
 use strict;
 use AppConfig qw(ARGCOUNT_HASH);
+use Data::Dumper;
 
 sub pb_init {
@@ -17 +18 @@
                             # Auto Create variables mentioned in Conf file
                             CREATE => 1,
-                            DEBUG => 0,
+                            DEBUG => 1,
                             GLOBAL => {
                                 # Each conf item is a hash
-                                ARGCOUNT => AppConfig::ARGCOUNT_HASH
+                                DEFAULT => { },
+                                ARGCOUNT => AppConfig::ARGCOUNT_HASH,
                             }
                         });
@@ -32 +34 @@
 $ptr = $config->get("confparam") || die "Unable to find confparam in $conffile";
 %confparam = %$ptr;
+print "confparam: ".Dumper($ptr)."\n";
 
 # 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";
 
 # List of additional pkg to build when all is called (optional)
 $ptr = $config->get("extpkgdir");
+print "extpkgdir1: ".Dumper($ptr)."\n";
 if (not defined $ptr) {
     %extpkgdir = ();
@@ -44 +49 @@
     %extpkgdir = %$ptr;
 }
+print "extpkgdir: ".Dumper(\%extpkgdir)."\n";
 
 # Valid version names (optional)
@@ -52 +58 @@
     %version = %$ptr;
 }
+print "version: ".Dumper(\%version)."\n";
 
 # List of files to filter (optional)
@@ -60 +67 @@
     %filteredfiles = %$ptr;
 }
+print "filteredfiles: ".Dumper(\%filteredfiles)."\n";
 
 }