Changeset 136 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Sep 12, 2007, 3:09:02 AM (17 years ago)

Author:

Bruno Cornec

Message:

Again lots of various fixes for VM support (close)

File:

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

devel/pb/bin/pb

@@ -117 +117 @@
     pb_cms2build();
     pb_build2vm();
-} elsif ($action =~ /^cms2ssh$/) {
-    pb_cms2build();
-    pb_build2vm();
-    pb_build2ssh();
-    pb_pkg2ssh();
 } elsif ($action =~ /^clean$/) {
 } else {
@@ -338 +333 @@
                 }
             }
-            $made="$made $ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm";
+            $made="$made RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm";
         } elsif ($dtype eq "deb") {
-            my $tmp = "$ENV{'PBBUILDDIR'}/$pbpkg";
-            $made="$made $tmp"."_*.deb $tmp"."_*.dsc $tmp"."_*.tar.gz";
+            $made="$made $pbpkg"."_*.deb $pbpkg"."_*.dsc $pbpkg"."_*.tar.gz";
         } elsif ($dtype eq "ebuild") {
-            $made="$made $ENV{'PBBUILDDIR'}/portage/*/$pbpkg/$pbpkg-$pbver.ebuild";
+            $made="$made portage/*/$pbpkg/$pbpkg-$pbver.ebuild";
             pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
         } elsif ($dtype eq "slackware") {
-            $made="$made $ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
+            $made="$made build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
             pb_mkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
         } else {
@@ -381 +375 @@
     @pkgs = @$ptr;
 
-    # Get the running distro to build on
+    # Get the running distro to consider
     my ($odir,$over) = (undef, undef);
     if (defined $vm) {
@@ -431 +425 @@
     my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
     my $tdir;
+    my $bdir;
     if ($cmt eq "Sources") {
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src";
     } elsif ($cmt eq "VMs") {
-        $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}");
+        $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}")."/delivery";
+        $bdir = dirname("$sshdir->{$ENV{'PBPROJ'}}")."/build";
+        # Remove a potential $ENV{'HOME'} as bdir should be relative to pb's home
+        $bdir =~ s|\$ENV.+\}/||;
     } elsif ($cmt eq "Packages") {
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
@@ -440 +438 @@
         return;
     }
-    # Remove a potential $ENV{'HOME'} as tdir shold be relative to pb's home
+    # Remove a potential $ENV{'HOME'} as tdir should be relative to pb's home
     $tdir =~ s|\$ENV.+\}/||;
 
     $port = $sshport->{$ENV{'PBPROJ'}};
-    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");
+    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $basesrc\"","Preparing $tdir on $mac");
+    pb_system("cd $ENV{'PBBUILDDIR'} ; scp -p -P $port $src $mac:$tdir 2> /dev/null","$cmt delivery in $tdir on $mac");
+    pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; 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/delivery/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
+        pb_system("scp -p -P $port $mac:$bdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'} 2> /dev/null","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>;
@@ -455 +453 @@
         close(KEEP);
         $src =~ s/^ *//;
-        $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_mkdir_p("$ENV{'PBBUILDDIR'}/$odir/$over");
+        foreach my $p (split(/ +/,$src)) {
+            pb_system("scp -p -P $port $mac:\'$bdir/$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of ".basename($p)." in $tdir from $mac");
+        }
+        #pb_system("ssh -q -p $port $mac \"rm -rf dirname("$sshdir->{$ENV{'PBPROJ'}}"); sudo /usr/bin/poweroff\"","VM cleanup and halt on $mac");
         pb_send2ssh("Packages","$odir"."_"."$over");
         pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
@@ -611 +611 @@
     print "\n";
     print "-m machine : Name of the virtual Machines you want\n";
-    print "             to build on (space separated)        \n";
+    print "             to build on (space separated). All if none precised\n";
     print "             (or use the env variable PBVM)       \n";
     print "\n";
@@ -628 +628 @@
     print "\n";
     print "\tbuild2pkg: Create packages for your running distribution  \n";
-    print "\t           first parameter is version-tag to build\n";
-    print "\t           if not using default version-tag\n";
-    print "\t           following parameters are packages to build\n";
-    print "\t           if not using default list\n";
     print "\n";
     print "\tbuild2ssh: Send the tar files to a SSH host               \n";
@@ -639 +635 @@
     print "\tcms2pkg:   cms2build + build2pkg\n";
     print "\n";
-}
+    print "\tbuild2vm:  Create packages in a Virtual Machine  \n";
+    print "\t           adn send them to a SSH host once built\n";
+    print "\t           VM supported are QEMU                 \n";
+    print "\n";
+    print "\tcms2vm:    cms2build + build2vm\n";
+    print "\n";
+}