Changes in devel/pb/lib/common.pm [18:30] in ProjectBuilder

File:

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

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;
@@ -99 +118 @@
 
 sub pbmkdir_p {
-    my @dir = @_;
-    my $ret = mkpath(@dir, 0, 0755);
-    return($ret);
+my @dir = @_;
+my $ret = mkpath(@dir, 0, 0755);
+return($ret);
 }
 
 sub pbrm_rf {
-    my @dir = @_;
-    my $ret = rmtree(@dir, 0, 0);
-    return($ret);
+my @dir = @_;
+my $ret = rmtree(@dir, 0, 0);
+return($ret);
 }
 
+sub pbsystem {
+
+my $cmd=shift;
+my $cmt=shift || $cmd;
+
+print $LOG "$cmt... ";
+system("$cmd");
+if ($? == -1) {
+    print $LOG "failed to execute: $!\n" if ($debug >= 0);
+} elsif ($? & 127) {
+    printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+} else {
+    print $LOG "OK\n" if ($debug >= 0);
+}
+}
 1;