Changeset 68 in ProjectBuilder for devel/pb/lib/ProjectBuilder

Timestamp:

Aug 31, 2007, 1:45:51 PM (17 years ago)

Author:

Bruno Cornec

Message:

Remove use of PBTOPDIR useless
delivery dir is cleaned of dir in it only now.
One level less generated during delivery (easier)

File:

• devel/pb/lib/ProjectBuilder/common.pm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/common.pm

@@ -103 +103 @@
 # Adapt to your needs
 # Set delivery directory
+# Removes all directory existing below as they are temp dir only
+# Files stay and have to be cleaned up manually
 #
 chdir "$ENV{'PBROOT'}/..";
 my $path = `pwd`;
 chomp($path);
-$ENV{'PBTOPDIR'}=$path."/delivery";
-$ENV{'PBDESTDIR'}="$ENV{'PBTOPDIR'}/$ENV{'PBVER'}-$ENV{'PBTAG'}";
+$ENV{'PBDESTDIR'}=$path."/delivery";
 if (-d $ENV{'PBDESTDIR'}) {
     opendir(DIR,$ENV{'PBDESTDIR'}) || die "Unable to open directory $ENV{'PBDESTDIR'}: $!";
     foreach my $d (readdir(DIR)) {
         next if ($d =~ /^\./);
+        next if (-f "$ENV{'PBDESTDIR'}/$d");
         pbrm_rf("$ENV{'PBDESTDIR'}/$d") if (-d "$ENV{'PBDESTDIR'}/$d");
     }