Changeset 69

Timestamp:

08/31/07 15:20:15 (6 years ago)

Author:

bruno

Message:

Rework interfaces of pb_init, conf files content and management to ease usage

Location:

devel/pb

Files:

• bin/pb (modified) (5 diffs)
• lib/ProjectBuilder/common.pm (modified) (2 diffs)
• lib/ProjectBuilder/pb.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -20 +20 @@
 use POSIX qw(strftime);
 
-use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles %pbroot $debug $LOG $projectbuilderver $projectbuilderrev);
+use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles $debug $LOG $projectbuilderver $projectbuilderrev);
 $debug = 0;                 # Debug level
 $LOG = *STDOUT;             # Where to log
@@ -252 +252 @@
 
         # Archive dest dir
-        chdir "$ENV{'PBDESTDIR'}";
+        chdir "$ENV{'PBDESTDIR'}" || die "Unable to change dir to $ENV{'PBDESTDIR'}";
         # Possibility to look at PBSRC to guess more the filename
         pbsystem("tar cfpz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
         print $LOG "Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n" if ($debug >= 0);
         # Keep track of what is generated for build2pkg default
-        open(LAST,"> $ENV{'PBDESTDIR'}/LAST") || die "Unable to create $ENV{'PBDESTDIR'}/LAST";
+        open(LAST,"> $ENV{'PBDESTDIR'}/pbrc") || die "Unable to create $ENV{'PBDESTDIR'}/pbrc";
         print LAST "$pbver-$pbtag\n";
         close(LAST);
@@ -265 +265 @@
     my $vertag = shift @ARGV;
     if (not defined $vertag) {
-        open(LAST,"$ENV{'PBDESTDIR'}/LAST") || die "Unable to open $ENV{'PBDESTDIR'}/LAST\nYou may want to precise as parameter version-tag";
+        open(LAST,"$ENV{'PBDESTDIR'}/pbrc") || die "Unable to open $ENV{'PBDESTDIR'}/pbrc\nYou may want to precise as parameter version-tag";
         $vertag = <LAST>;
         chomp($vertag);
@@ -411 +411 @@
     print "pb (aka project-builder) Version $projectbuilderver-$projectbuilderrev\n";
     print "\n";
-    print "Syntax: pb [-vhqt][-p project] <action> [<params>...]\n";
+    print "Syntax: pb [-vhqt][-r pbroot][-p project] <action> [<params>...]\n";
     print "\n";
     print "-h : This help file\n";
@@ -417 +417 @@
     print "-t : Test mode (not done yet)\n";
     print "-v : Verbose mode\n";
+    print "\n";
+    print "-r pbroot  : Path Name of project under the CMS \n";
+    print "             (or use the env variable PBROOT)   \n";
     print "\n";
     print "-p project : Name of the project you're working on\n";

devel/pb/lib/ProjectBuilder/common.pm

@@ -32 +32 @@
     $proj = $ENV{'PBPROJ'};
 }
+
+#
+# We get the pbrc file for that project 
+# and use its content
+#
+$pbrc = pb_init("$ENV{'PBETC'}","pbrc");
+
+my %pbrc = %$pbrc;
+if (not defined $proj) {
+    # Take the first as the default project
+    $proj = (keys %pbrc)[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));
+
+#
+# Set delivery directory
+#
+my $topdir=basename($pbrc{$proj});
+chdir $topdir || die "Unable to change directory to $topdir";
+$ENV{'PBDESTDIR'}=$topdir."/delivery";
+
 #
 # Use project configuration file if needed
 #
 if (not defined $ENV{'PBROOT'}) {
-    pb_init("$ENV{'PBETC'}");
-
-    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));
+    if (-f $pbrc{$proj}) {
+        $pbroot = pb_init($pbrc{$proj},"pbroot");
+        # There is normaly only one line in it
+        $ENV{'PBROOT'} = (values %$pbroot)[0] if (defined $pbroot); 
+        print $LOG "Using $ENV{'PBROOT'} as default pbroot from $pbrc{$proj}\n" if (($debug >= 0) and (defined $ENV{'PBROOT'}));
     }
-    die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
-
-    $ENV{'PBROOT'} = $pbroot{$proj}; 
-} else {
-    die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
+    die "No pbroot defined - use env var PBROOT or -r pbroot " if (not defined $ENV{'PBROOT'});
 }
 
@@ -101 +118 @@
 
 #
-# Adapt to your needs
-# Set delivery directory
-# Removes all directory existing below as they are temp dir only
+# Removes all directory existing below the delivery dir 
+# as they are temp dir only
 # Files stay and have to be cleaned up manually
 #
-chdir "$ENV{'PBROOT'}/..";
-my $path = `pwd`;
-chomp($path);
-$ENV{'PBDESTDIR'}=$path."/delivery";
 if (-d $ENV{'PBDESTDIR'}) {
     opendir(DIR,$ENV{'PBDESTDIR'}) || die "Unable to open directory $ENV{'PBDESTDIR'}: $!";

devel/pb/lib/ProjectBuilder/pb.pm

@@ -9 +9 @@
 use AppConfig qw(ARGCOUNT_HASH ARGCOUNT_ONE);
 use Data::Dumper;
-use vars qw (%pbroot);
 
 sub pb_init {
 
 my $conffile = shift;
+my $param = shift;
 my $trace;
 
@@ -33 +33 @@
                         });
 $config->file($conffile);
-my $ptr = $config->get("pbroot") || die "Unable to find pbroot in $conffile";
+my $ptr = $config->get($param) || die "Unable to find $param in $conffile";
 print "DEBUG: pbroot: ".Dumper($ptr)."\n" if ($debug >= 1);
-%pbroot = %$ptr;
+return($ptr);
 }