Changeset 118 in ProjectBuilder for devel

Timestamp:

Sep 8, 2007, 3:18:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

Coding of build2vm done. tests not done as it's too late ;-)

File:

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

devel/pb/bin/pb

@@ -306 +306 @@
 
     chdir "$ENV{'PBBUILDDIR'}";
+    my $made; # pkgs made during build
     foreach my $pbpkg (@pkgs) {
         my $vertag = $pkg->{$pbpkg};
@@ -337 +338 @@
                 }
             }
-        } elsif ($dtype eq "tgz") {
+            $made="$made $ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm $ENV{'PBBUILDDIR'}/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"
+        } elsif ($dtype eq "ebuild") {
+            $made="$made $ENV{'PBBUILDDIR'}/portage/*/$pbpkg/$pbpkg-$pbver.ebuild"
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
+        } elsif ($dtype eq "slackware") {
             pb_mkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
-        } elsif ($dtype eq "ebuild") {
-            pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
+            $made="$made $ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz"
         } else {
-        }
-    }
+            die "Unknown dtype format $dtype";
+        }
+    }
+    # Keep track of what is generated so that we can get them back from VMs
+    open(KEEP,"> $ENV{'PBDESTDIR'}/pbgen") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen";
+    print KEEP "$made\n";
+    close(KEEP);
 }
 
@@ -359 +371 @@
 
     my $cmt = shift;
+    my $vm = shift || undef;
     my $host = shift || "sshhost";
     my $login = shift || "sshlogin";
@@ -364 +377 @@
     my $port = shift || "sshport";
 
-    my @src;
-
     # Get list of packages to build
     my $ptr = pb_get_pkg($defpkgdir,$extpkgdir);
@@ -371 +382 @@
 
     # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
+    my ($odir,$over) = (undef, undef);
+    if (defined $vm) {
+        ($odir,$over) = split(/_/,$vm);
+    }
+    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over);
     print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n" if ($debug >= 1);
 
@@ -378 +393 @@
     $pkg = { } if (not defined $pkg);
 
+    my $src = "";
     chdir "$ENV{'PBBUILDDIR'}";
-    my $src;
     foreach my $pbpkg (@pkgs) {
         my $vertag = $pkg->{$pbpkg};
@@ -385 +400 @@
         ($pbver,$pbtag) = split(/-/,$vertag);
 
-        if ($cmt eq "Sources") {
-            $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
-        } elsif ($cmt eq "VMs") {
-            $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz $ENV{'PBDESTDIR'}/pbscript $ENV{'PBETC'}";
-        } elsif ($cmt eq "Packages") {
-            if ($dtype eq "rpm") {
-                $src="$ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm"
-            } elsif ($dtype eq "deb") {
-                my $tmp = "$ENV{'PBBUILDDIR'}/$pbpkg";
-                $src="$tmp"."_*.deb $tmp"."_*.dsc $tmp"."_*.tar.gz"
-            } elsif ($dtype eq "ebuild") {
-                $src="$ENV{'PBBUILDDIR'}/portage/*/$pbpkg/$pbpkg-$pbver.ebuild"
-            } elsif ($dtype eq "slackware") {
-                $src="$ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz"
-            } else {
-                die "Unknown dtype format $dtype";
-            }
-            # Also make a pbscript to generate yum/urpmi/apt bases
+        if (($cmt eq "Sources") || ($cmt eq "VMs")) {
+            $src="$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+        }
+    }
+    if ($cmt eq "VMs") {
+        $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb $ENV{'PBETC'}";
+    } elsif ($cmt eq "Packages") {
+        # Get package list from file made during build2pkg
+        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$vertag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen";
+        my $src = <KEEP>;
+        chomp($src);
+        close(KEEP);
+        if ($dtype eq "rpm") {
+            # Also make a pbscript to generate yum/urpmi bases
             # $src = "$src $ENV{'PBDESTDIR'}/pbscript"
-        }
-        push @src, $src;
-    }
-    $src = join(' ',@src);
+        } elsif ($dtype eq "deb") {
+            # Also make a pbscript to generate apt bases
+            # $src = "$src $ENV{'PBDESTDIR'}/pbscript"
+        }
+    }
+
     print $LOG "$cmt: $src\n" if ($debug >= 0);
     my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
@@ -424 +437 @@
     pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $src\"","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 \"cd $tdir ; if [ -f pbscript ]; then chmod 755 ./pbscript ; ./pbscript\"","Executing pbscript on $mac");
+    pb_system("ssh -q -p $port $mac \"cd $tdir ; if [ -f pbscript ]; then ./pbscript\"; fi","Executing pbscript on $mac");
     if ($cmt eq "VMs") {
-        pb_system("scp -p -P $port $mac:$tdir/.... ...","Package recovery in $tdir from $mac");
+            # Get back info on pkg produced, compute their name and get them from the VM
+        pb_system("scp -p -P $port $mac:$tdir/pbgen-$vertag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
+        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$vertag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$vertag";
+        my $src = <KEEP>;
+        chomp($src);
+        close(KEEP);
+        pb_system("scp -p -P $port $mac:$tdir/{".join(',',$src)."} $ENV{'PBBUILDDIR'}/$odir/$over","Package recovery of in $tdir from $mac");
+        pb_send2ssh("Packages","$odir_$over");
+        pb_rm_rf($ENV{'PBBUILDDIR'}/$odir);
     }
 }
@@ -435 +456 @@
     # Prepare the script to be executed on the VM
     # in $ENV{'PBDESTDIR'}/pbscript
-    # Launch the VM
-    # Gather all required files to send them to the VM
-    pb_send2ssh("VMs","vmhost","vmlogin","vmdir","vmport");
-    
+    open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
+    print SCRIPT "#!/bin/bash\n";
+    print SCRIPT "# Move the copied .pbrc to the home dir on the build account\n";
+    print SCRIPT "mv .pbrc \$ENV{'HOME'}\n";
+    print SCRIPT "# Setup the variables required for building\n";
+    print SCRIPT "export PBPROJ=$ENV{'PBPROJ'}\n";
+    print SCRIPT "export PBROOT=\`pwd\`\n";
+    print SCRIPT "# Build\n";
+    print SCRIPT "pb build2pkg $ARGV[0]\n";
+    close(SCRIPT);
+    chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";
+
     # Send tar files when we do a global generation
     pb_build2ssh() if ($all == 1);
+
+    foreach my $v (@$vm) {
+        # Launch the VMs
+
+        # Gather all required files to send them to the VM and launch the build thourgh pbscript
+        pb_send2ssh("VMs","$v","vmhost","vmlogin",dirname($pbrc->{$ENV{'PBPROJ'}}),"vmport");
+    }
 }