Changeset 68 in 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)

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -254 +254 @@
         chdir "$ENV{'PBDESTDIR'}";
         # Possibility to look at PBSRC to guess more the filename
-        pbsystem("tar cfphz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
+        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{'PBTOPDIR'}/LAST") || die "Unable to create $ENV{'PBTOPDIR'}/LAST";
+        open(LAST,"> $ENV{'PBDESTDIR'}/LAST") || die "Unable to create $ENV{'PBDESTDIR'}/LAST";
         print LAST "$pbver-$pbtag\n";
         close(LAST);
@@ -265 +265 @@
     my $vertag = shift @ARGV;
     if (not defined $vertag) {
-        open(LAST,"$ENV{'PBTOPDIR'}/LAST") || die "Unable to open $ENV{'PBTOPDIR'}/LAST\nYou may want to precise as parameter version-tag";
+        open(LAST,"$ENV{'PBDESTDIR'}/LAST") || die "Unable to open $ENV{'PBDESTDIR'}/LAST\nYou may want to precise as parameter version-tag";
         $vertag = <LAST>;
         chomp($vertag);

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");
     }