Changeset 129


Ignore:
Timestamp:
Sep 10, 2007, 12:59:24 PM (12 years ago)
Author:
bruno
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r128 r129  
    353353    }
    354354    # Keep track of what is generated so that we can get them back from VMs
    355     open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
     355    open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
    356356    print KEEP "$made\n";
    357357    close(KEEP);
     
    408408    } elsif ($cmt eq "Packages") {
    409409        # Get package list from file made during build2pkg
    410         open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
     410        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
    411411        $src = <KEEP>;
    412412        chomp($src);
     
    420420        }
    421421    }
    422     my $basesrc = map { basename($_) } split(/ /,$src);
     422    my $basesrc = "";
     423    $basesrc = map { $basesrc." ".basename($_) } split(/ /,$src);
    423424
    424425    print $LOG "Sources handled ($cmt): $src\n" if ($debug >= 0);
     
    429430        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src";
    430431    } elsif ($cmt eq "VMs") {
    431         $tdir = basename("$sshdir->{$ENV{'PBPROJ'}}");
     432        $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}");
    432433    } elsif ($cmt eq "Packages") {
    433434        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
     
    441442    if ($cmt eq "VMs") {
    442443        # Get back info on pkg produced, compute their name and get them from the VM
    443         pb_system("scp -p -P $port $mac:$tdir/pbgen-$pbprojver$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
    444         open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
     444        pb_system("scp -p -P $port $mac:$tdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
     445        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
    445446        my $src = <KEEP>;
    446447        chomp($src);
     
    607608    print "             (or use the env variable PBROOT)   \n";
    608609    print "\n";
    609     print "<params> can be the name of packages\n";
    610610    print "<action> can be:\n";
    611611    print "\n";
Note: See TracChangeset for help on using the changeset viewer.