Changeset 415 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Conf.pm

Timestamp:

Apr 26, 2008, 2:45:36 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds support for a build system conf file under $vmpath/.pbrc or $vepath/.pbrc
• Fix .pm modes

File:

• devel/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (5 diffs)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -60 +60 @@
 sub pb_conf_init {
 
+pb_log(2,"DEBUG: pb_conf_init with ".Dumper(@_)."\n");
 @pbconffiles = @_;
 }
@@ -71 +72 @@
 sub pb_conf_add {
 
-my $f = shift;
-
-push(@pbconffiles,"$f");
+pb_log(2,"DEBUG: pb_conf_add with ".Dumper(@_)."\n");
+push(@pbconffiles,@_);
 }
 
@@ -220 +220 @@
 my $p2;
 
-pb_log(2,"DEBUG: pb_conf_get param1: ".Dumper(@ptr1)."\n");
-pb_log(2,"DEBUG: pb_conf_get param2: ".Dumper(@ptr2)."\n");
+pb_log(2,"DEBUG: pb_conf_get $conffile: ".Dumper(@ptr1)."\n");
+pb_log(2,"DEBUG: pb_conf_get input: ".Dumper(@ptr2)."\n");
 
 foreach my $i (0..$#param) {
@@ -229 +229 @@
     # in order to mask what could be defined already in ptr2
     if (not defined $p2) {
+        # exit if no p1 either
+        last if ((not defined $p1) || (not defined $ENV{'PBPROJ'}));
         # No ref in p2 so use p1
         $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if ((not defined $p1->{$ENV{'PBPROJ'}}) && (defined $p1->{'default'}));
@@ -261 +263 @@
     $ptr1[$i] = $p1;
 }
-pb_log(2,"DEBUG: pb_conf_get param ptr1: ".Dumper(@ptr1)."\n");
+pb_log(2,"DEBUG: pb_conf_get output: ".Dumper(@ptr1)."\n");
 return(\@ptr1);
 }