Changeset 72 in ProjectBuilder

Timestamp:

Aug 31, 2007, 3:40:54 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix the pbrc file content read in build2pkg

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -19 +19 @@
 use Time::localtime qw(localtime);
 use POSIX qw(strftime);
+use ProjectBuilder::pb qw (pb_init);
 
 use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles %pbrc $debug $LOG $projectbuilderver $projectbuilderrev);
@@ -258 +259 @@
         # 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";
+        print LAST "pbroot $pbver-$pbtag = $ENV{'PBROOT'}\n";
         close(LAST);
     }
@@ -265 +266 @@
     my $vertag = shift @ARGV;
     if (not defined $vertag) {
-        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);
-        close(LAST);
+        if (-f $pbrc{$ENV{'PBPROJ'}}) {
+            my $pbroot = pb_init($pbrc{$ENV{'PBPROJ'}},"pbroot");
+            # There is only one line normaly
+            $vertag = (keys %$pbroot)[0]
+            $ENV{'PBROOT'} = (values %$pbroot)[0]
+        } else {
+            die "Unable to open $pbrc{$ENV{'PBPROJ'}}\nYou may want to precise as parameter version-tag";
+        }
     }
     ($pbver,$pbtag) = split(/-/,$vertag);