Changeset 38 in ProjectBuilder for devel/pb/lib/common.pm

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

File:

• devel/pb/lib/common.pm (modified) (1 diff)

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"};