Changeset 129

Timestamp:

09/10/07 12:59:24 (6 years ago)

Author:

bruno

Message:

Another set of fixes for VM support. Still problem with map and ENV{'HOME'} analysis

File:

• devel/pb/bin/pb (modified) (6 diffs)

devel/pb/bin/pb

@@ -353 +353 @@
     }
     # Keep track of what is generated so that we can get them back from VMs
-    open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
+    open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
     print KEEP "$made\n";
     close(KEEP);
@@ -408 +408 @@
     } elsif ($cmt eq "Packages") {
         # Get package list from file made during build2pkg
-        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
+        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
         $src = <KEEP>;
         chomp($src);
@@ -420 +420 @@
         }
     }
-    my $basesrc = map { basename($_) } split(/ /,$src);
+    my $basesrc = "";
+    $basesrc = map { $basesrc." ".basename($_) } split(/ /,$src);
 
     print $LOG "Sources handled ($cmt): $src\n" if ($debug >= 0);
@@ -429 +430 @@
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src";
     } elsif ($cmt eq "VMs") {
-        $tdir = basename("$sshdir->{$ENV{'PBPROJ'}}");
+        $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}");
     } elsif ($cmt eq "Packages") {
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
@@ -441 +442 @@
     if ($cmt eq "VMs") {
         # Get back info on pkg produced, compute their name and get them from the VM
-        pb_system("scp -p -P $port $mac:$tdir/pbgen-$pbprojver$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
-        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
+        pb_system("scp -p -P $port $mac:$tdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
+        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
         my $src = <KEEP>;
         chomp($src);
@@ -607 +608 @@
     print "             (or use the env variable PBROOT)   \n";
     print "\n";
-    print "<params> can be the name of packages\n";
     print "<action> can be:\n";
     print "\n";