Changeset 38 in ProjectBuilder for devel/pb/lib

Timestamp:

Aug 9, 2007, 4:13:27 PM (17 years ago)

Author:

Bruno Cornec

Message:

/etc/pb/proj now contains the strict minimum
rest is under pbconf/proj.pb

Location:

devel/pb/lib

Files:

• common.pm (modified) (1 diff)
• pb.pm (modified) (2 diffs)

devel/pb/lib/common.pm

@@ -34 +34 @@
 # Use project configuration file
 #
-pb_init("$ENV{'PBETC'}/$proj.pb");
+my $pbroot=pb_init("$ENV{'PBETC'}/$proj");
+
+if (not defined $pbroot) {
+    die "pbroot doesn't exist in $ENV{'PBETC'}/$proj";
+} else {
+    $ENV{'PBROOT'} = $pbroot; 
+}
+
+pb_conf_init("$ENV{'PBROOT'}/pbconf/$proj.pb");
 
 #
 # Check content
 #
-if (not defined $confparam{"pbroot"}) {
-    die "confparam pbroot doesn't exist in $ENV{'PBETC'}/$proj.pb";
-} else {
-    $ENV{'PBROOT'} = $confparam{"pbroot"}; 
-}
 if (defined $confparam{"cvsroot"}) {
     $ENV{'CVSROOT'} = $confparam{"cvsroot"}; 

devel/pb/lib/pb.pm

@@ -11 +11 @@
 
 sub pb_init {
+
+my $conffile = shift;
+my $trace;
+
+if ($debug > 0) {
+    $trace = 1;
+} else {
+    $trace = 0;
+}
+
+
+my $config = AppConfig->new({
+                            # Auto Create variables mentioned in Conf file
+                            CREATE => 1,
+                            DEBUG => $trace,
+                            GLOBAL => {
+                                # Each conf item is a hash
+                                DEFAULT => { },
+                                ARGCOUNT => AppConfig::ARGCOUNT_ONE,
+                            }
+                        });
+$config->file($conffile);
+my $ptr = $config->get("pbroot") || die "Unable to find pbroot in $conffile";
+return($ptr);
+}
+
+sub pb_conf_init {
 
 my $conffile = shift;
@@ -50 +77 @@
 # List of additional pkg to build when all is called (optional)
 $ptr = $config->get("extpkgdir");
-print "DEBUG: extpkgdir1: ".Dumper($ptr)."\n" if ($debug >= 1);
 if (not defined $ptr) {
     %extpkgdir = ();