Changeset 132 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 11, 2007, 12:55:17 AM (17 years ago)

Author:

Bruno Cornec

Message:

Lots of small fixes for vm management.
pb is able now to lauch correctly script on the VM and build packages.
Still working on result backup.

File:

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

devel/pb/bin/pb

@@ -405 +405 @@
     }
     if ($cmt eq "VMs") {
-        $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb $ENV{'PBETC'}";
+        $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb $ENV{'PBETC'}";
     } elsif ($cmt eq "Packages") {
         # Get package list from file made during build2pkg
@@ -420 +420 @@
         }
     }
+    # Remove potential leading spaces (cause pb with basename)
+    $src =~ s/^ *//;
     my $basesrc = "";
     foreach my $i (split(/ +/,$src)) {
@@ -433 +435 @@
     } elsif ($cmt eq "VMs") {
         $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}");
-        # Expand a potential $ENV{'HOME'}
-        eval { $tdir =~ s/(\$ENV.+\})/$1/eeg };
     } elsif ($cmt eq "Packages") {
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
@@ -440 +440 @@
         return;
     }
+    # Remove a potential $ENV{'HOME'} as tdir shold be relative to pb's home
+    $tdir =~ s|\$ENV.+\}/||;
+
     $port = $sshport->{$ENV{'PBPROJ'}};
-    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $basesrc\"","Preparing $tdir on $mac");
-    pb_system("scp -p -P $port $src $mac:$tdir","$cmt delivery in $tdir on $mac");
-    pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; rm -f ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
+    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir/delivery ; cd $tdir/delivery ; rm -f $basesrc\"","Preparing $tdir on $mac");
+    pb_system("scp -p -P $port $src $mac:$tdir/delivery","$cmt delivery in $tdir on $mac");
+    pb_system("ssh -q -p $port $mac \"echo \'cd $tdir/delivery ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
     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");
+        pb_system("scp -p -P $port $mac:$tdir/delivery/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>;
@@ -452 +455 @@
         close(KEEP);
         $src =~ s/^ *//;
-        $src =~ s/ +/,/;
-        pb_system("scp -p -P $port $mac:$tdir/{$src} $ENV{'PBBUILDDIR'}/$odir/$over","Package recovery of in $tdir from $mac");
+        $src =~ s/ +/,/g;
+        pb_system("scp -p -P $port $mac:$tdir/delivery/{$src} $ENV{'PBBUILDDIR'}/$odir/$over","Package recovery of in $tdir from $mac");
+        #pb_system("ssh -q -p $port $mac \"rm -rf $tdir ; sido /usr/bin/poweroff\"","VM cleanup and halt on $mac");
         pb_send2ssh("Packages","$odir"."_"."$over");
-        pb_rm_rf($ENV{'PBBUILDDIR'}/$odir);
+        pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
     }
 }
@@ -467 +471 @@
     print SCRIPT "#!/bin/bash\n";
     print SCRIPT "echo ... Execution needed\n";
-    print SCRIPT "# Move the copied .pbrc to the home dir on the build account\n";
-    print SCRIPT "mv .pbrc \$HOME\n";
+    print SCRIPT "# This is in directory delivery\n";
     print SCRIPT "# Setup the variables required for building\n";
     print SCRIPT "export PBPROJ=$ENV{'PBPROJ'}\n";
+    print SCRIPT "# Preparation for pb\n";
+    print SCRIPT "mkdir -p ../pbconf\n";
+    print SCRIPT "mv $ENV{'PBPROJ'}.pb ../pbconf\n";
+    print SCRIPT "mv .pbrc \$HOME\n";
+    print SCRIPT "cd ..\n";
     print SCRIPT "export PBROOT=\`pwd\`\n";
     print SCRIPT "# Build\n";
     my $p = "";
     $p = $ARGV[0] if (defined $ARGV[0]);
-    print SCRIPT "echo Building packages on $vm\n";
+    print SCRIPT "echo Building packages on VM...\n";
     print SCRIPT "pb build2pkg $p\n";
-    print SCRIPT "echo End of build. Halting VM.\n";
-    print SCRIPT "sudo halt -p\n";
     close(SCRIPT);
     chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";