Changeset 291 in ProjectBuilder for devel/pb/lib

Timestamp:

Dec 20, 2007, 11:10:49 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Removes AppConfig dependency by using just a perl regexp instead.
• Interface to the version field has also changed

File:

• devel/pb/lib/ProjectBuilder/Base.pm (modified) (6 diffs)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -11 +11 @@
 use File::Path;
 use File::Temp qw /tempdir/;
-use AppConfig qw(ARGCOUNT_HASH);
 use Data::Dumper;
 
@@ -127 +126 @@
         }
     }
-    die "Invalid version name $ENV{'PBVER'} in $ENV{'PBCONF'}/$proj.pb" if (($ENV{'PBVER'} !~ /[0-9.]+/) && (not exists $version{$ENV{'PBVER'}}));
+    die "Invalid version name $ENV{'PBVER'} in $ENV{'PBCONF'}/$proj.pb" if (($ENV{'PBVER'} !~ /[0-9.]+/) && (not defined $version) && ($ENV{'PBVER'} =~ /$version{$proj}/));
     
     if (not defined $ENV{'PBTAG'}) {
@@ -754 +753 @@
 }
 
-sub pb_no_err {
-}
-
 # Function which returns a pointer on a hash
 # corresponding to a declaration (arg2) in a conf file (arg1)
@@ -765 +761 @@
 my $trace;
 my @ptr;
+my %h;
 
 my $debug = 0;
 
-if ($debug > 0) {
-    $trace = 1;
-} else {
-    $trace = 0;
-}
-
-
-my $config = AppConfig->new({
-                            # Auto Create variables mentioned in Conf file
-                            CREATE => 1,
-                            DEBUG => $trace,
-                            ERROR => \&pb_no_err,
-                            GLOBAL => {
-                                # Each conf item is a hash
-                                ARGCOUNT => ARGCOUNT_HASH,
-                            },
-                        });
-$config->file($conffile);
+open(CONF,$conffile) || die "Unable to open $conffile";
+while(<CONF>) {
+    if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
+        print "DEBUG: 1:$1 2:$2 3:$3\n" if ($debug >= 1);
+        $h{$1}{$2}=$3;
+    }
+}
+close(CONF);
+
 for my $param (@param) {
-    push @ptr,$config->get($param);
-}
-print "DEBUG: params: ".Dumper(@param)." ".Dumper(@ptr)."\n" if ($debug >= 1);
+    push @ptr,$h{$param};
+}
+print "DEBUG: h:".Dumper(%h)." param:".Dumper(@param)." ptr:".Dumper(@ptr)."\n" if ($debug >= 1);
 return(@ptr);
 }
@@ -1030 +1018 @@
 my $ptr; # returned value pointer on the hash of filters
 my %ptr;
+my %h;
 
 # Global filter files first, then package specificities
@@ -1062 +1051 @@
     print $LOG "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
 
-    my $config = AppConfig->new({
-        # Auto Create variables mentioned in Conf file
-        CREATE => 1,
-        DEBUG => 0,
-        GLOBAL => {
-            # Each conf item is a hash
-            ARGCOUNT => AppConfig::ARGCOUNT_HASH
+    foreach my $f (@ffiles) {
+        open(CONF,$f) || next;
+        while(<CONF>)  {
+            if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
+                $h{$1}{$2}=$3;
+            }
         }
-    });
-
-    $config->file(@ffiles);
-    $ptr = $config->get("filter");
-    print $LOG "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
+        close(CONF);
+
+        $ptr = $h{"filter"};
+        print $LOG "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
+    }
 } else {
     $ptr = { };