Changeset 71 in ProjectBuilder for devel/pb/lib

Timestamp:

Aug 31, 2007, 3:32:39 PM (17 years ago)

Author:

Bruno Cornec

Message:

Still some fixes

File:

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

devel/pb/lib/ProjectBuilder/common.pm

@@ -51 +51 @@
 # Set delivery directory
 #
-my $topdir=basename($pbrc{$proj});
+my $topdir=dirname($pbrc{$proj});
 chdir $topdir || die "Unable to change directory to $topdir";
 $ENV{'PBDESTDIR'}=$topdir."/delivery";
@@ -60 +60 @@
 if (not defined $ENV{'PBROOT'}) {
     if (-f $pbrc{$proj}) {
-        $pbroot = pb_init($pbrc{$proj},"pbroot");
+        my $pbroot = pb_init($pbrc{$proj},"pbroot");
+        my %pbroot = %$pbroot;
         # There is normaly only one line in it
         $ENV{'PBROOT'} = (values %$pbroot)[0] if (defined $pbroot); 
@@ -139 +140 @@
 # Set build directory
 #
-$ENV{'PBBUILDDIR'}=$path."/build";
+$ENV{'PBBUILDDIR'}=$topdir."/build";
 pbrm_rf($ENV{'PBBUILDDIR'}) if (-d "$ENV{'PBBUILDDIR'}");
 pbmkdir_p($ENV{'PBBUILDDIR'}) || die "Unable to recursively create $ENV{'PBBUILDDIR'}";