Changeset 70

Timestamp:

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

Author:

bruno

Message:

pbrc is now global and no hardcoded conf file used anymore

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -20 +20 @@
 use POSIX qw(strftime);
 
-use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles $debug $LOG $projectbuilderver $projectbuilderrev);
+use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles %pbrc $debug $LOG $projectbuilderver $projectbuilderrev);
 $debug = 0;                 # Debug level
 $LOG = *STDOUT;             # Where to log
@@ -256 +256 @@
         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'}/pbrc") || die "Unable to create $ENV{'PBDESTDIR'}/pbrc";
+        # Keep track of what is generated for default
+        open(LAST,"> $pbrc{$ENV{'PBPROJ'}}") || die "Unable to create $pbrc{$ENV{'PBPROJ'}}";
         print LAST "$pbver-$pbtag\n";
         close(LAST);
@@ -265 +265 @@
     my $vertag = shift @ARGV;
     if (not defined $vertag) {
-        open(LAST,"$ENV{'PBDESTDIR'}/pbrc") || die "Unable to open $ENV{'PBDESTDIR'}/pbrc\nYou may want to precise as parameter version-tag";
+        open(LAST,"$pbrc{$ENV{'PBPROJ'}}") || die "Unable to open $pbrc{$ENV{'PBPROJ'}}\nYou may want to precise as parameter version-tag";
         $vertag = <LAST>;
         chomp($vertag);

devel/pb/lib/ProjectBuilder/common.pm

@@ -13 +13 @@
 use File::Temp qw /tempdir/;
 use Data::Dumper;
+use vars qw (%pbrc);
 
 $ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
@@ -37 +38 @@
 # and use its content
 #
-$pbrc = pb_init("$ENV{'PBETC'}","pbrc");
+my $pbrc = pb_init("$ENV{'PBETC'}","pbrc");
 
-my %pbrc = %$pbrc;
+%pbrc = %$pbrc;
 if (not defined $proj) {
     # Take the first as the default project