Changeset 49

Timestamp:

08/26/07 11:58:03 (6 years ago)

Author:

bruno

Message:

conf file is now in the home directory to allow for multi user usage of pb
cms2build and build2pkg are working roughly for pb
Next test with mondo

Location:

devel/pb

Files:

• bin/pb.pl (modified) (1 diff)
• lib/common.pm (modified) (4 diffs)
• lib/pb.pm (modified) (2 diffs)

devel/pb/bin/pb.pl

@@ -20 +20 @@
 use POSIX qw(strftime);
 
-use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles $debug $LOG);
+use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles %pbroot $debug $LOG);
 $debug = 0;                 # Debug level
 $LOG = *STDOUT;             # Where to log

devel/pb/lib/common.pm

@@ -14 +14 @@
 use Data::Dumper;
 
-$ENV{'PBETC'} = "/etc/pb";
+$ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
 
 sub env_init {
@@ -24 +24 @@
 #
 # Check project name
+# Could be with env var PBPROJ
+# or option -p
+# if not define take the first in conf file
 #
 if ((defined $ENV{'PBPROJ'}) &&
@@ -29 +32 @@
     $proj = $ENV{'PBPROJ'};
 }
-die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
-
 #
 # Use project configuration file
 #
-my $pbroot=pb_init("$ENV{'PBETC'}/$proj");
+pb_init("$ENV{'PBETC'}");
 
-if (not defined $pbroot) {
-    die "pbroot doesn't exist in $ENV{'PBETC'}/$proj";
+if (not defined $proj) {
+    # Take the first as the default project
+    $proj = (keys %pbroot)[0];
+    print $LOG "Using $proj as default project as none has been specified\n" if (($debug >= 0) and (defined $proj));
+}
+die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
+
+$ENV{'PBROOT'} = $pbroot{$proj}; 
+
+#
+# Check pb conf compliance
+#
+$ENV{'PBCONF'} = "$ENV{'PBROOT'}/pbconf";
+die "Project $proj not Project-Builder compliant. Please populate $ENV{'PBCONF'}" if ( not -d "$ENV{'PBCONF'}");
+
+if (-f "$ENV{'PBCONF'}/$proj.pb") {
+    pb_conf_init("$ENV{'PBCONF'}/$proj.pb");
 } else {
-    $ENV{'PBROOT'} = $pbroot; 
+    die "Unable to open $ENV{'PBCONF'}/$proj.pb";
 }
-
-pb_conf_init("$ENV{'PBROOT'}/pbconf/$proj.pb");
 
 #
@@ -60 +74 @@
 }
 $ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
-
-#
-# Check pb conf compliance
-#
-$ENV{'PBCONF'} = "$ENV{'PBROOT'}/pbconf";
-die "Project $ENV{'PBPROJ'} not ProjectBuild compliant. Please populate $ENV{'PBCONF'}" if ( not -d "$ENV{'PBCONF'}");
 
 #

devel/pb/lib/pb.pm

@@ -9 +9 @@
 use AppConfig qw(ARGCOUNT_HASH ARGCOUNT_ONE);
 use Data::Dumper;
+use vars qw (%pbroot);
 
 sub pb_init {
@@ -28 +29 @@
                             GLOBAL => {
                                 # Each conf item is a hash
-                                ARGCOUNT => ARGCOUNT_ONE,
+                                ARGCOUNT => ARGCOUNT_HASH,
                             },
                         });
 $config->file($conffile);
 my $ptr = $config->get("pbroot") || die "Unable to find pbroot in $conffile";
-return($ptr);
+print "DEBUG: pbroot: ".Dumper($ptr)."\n" if ($debug >= 1);
+%pbroot = %$ptr;
 }