Changeset 25 in ProjectBuilder for devel/pb/lib/common.pm

Timestamp:

Aug 1, 2007, 3:30:16 AM (17 years ago)

Author:

Bruno Cornec

Message:

code of build2pkg done. tests begin

File:

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

devel/pb/lib/common.pm

@@ -89 +89 @@
 # Set delivery directory
 #
-$ENV{'PBTOPDIR'}="$ENV{'PBROOT'}/../delivery";
+chdir "$ENV{'PBROOT'}/..";
+my $path = `pwd`;
+chomp($path);
+$ENV{'PBTOPDIR'}=$path."/delivery";
 $ENV{'PBDESTDIR'}="$ENV{'PBTOPDIR'}/$ENV{'PBVER'}-$ENV{'PBTAG'}";
-pbrm_rf($ENV{'PBDESTDIR'}) if (-d "$ENV{'PBDESTDIR'}");
-pbmkdir_p($ENV{'PBDESTDIR'}) || die "Unable to recursively create $ENV{'PBDESTDIR'}";
+if (-d $ENV{'PBDESTDIR'}) {
+    opendir(DIR,$ENV{'PBDESTDIR'}) || die "Unable to open directory $ENV{'PBDESTDIR'}: $!";
+    foreach my $d (readdir(DIR)) {
+        next if ($d =~ /^\./);
+        pbrm_rf("$ENV{'PBDESTDIR'}/$d") if (-d "$ENV{'PBDESTDIR'}/$d");
+    }
+    closedir(DIR);
+}
+if (! -d "$ENV{'PBDESTDIR'}") {
+    pbmkdir_p($ENV{'PBDESTDIR'}) || die "Unable to recursively create $ENV{'PBDESTDIR'}";
+}
+
+#
+# Set build directory
+#
+$ENV{'PBBUILDDIR'}=$path."/build";
+pbrm_rf($ENV{'PBBUILDDIR'}) if (-d "$ENV{'PBBUILDDIR'}");
+pbmkdir_p($ENV{'PBBUILDDIR'}) || die "Unable to recursively create $ENV{'PBBUILDDIR'}";
 
 umask 0022;