Changeset 126 in ProjectBuilder

Timestamp:

Sep 9, 2007, 12:28:42 AM (17 years ago)

Author:

Bruno Cornec

Message:

Report of fixes of 0.7.3 in devel

File:

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

devel/pb/bin/pb

@@ -306 +306 @@
 
     chdir "$ENV{'PBBUILDDIR'}";
-    my $made; # pkgs made during build
+    my $made = ""; # pkgs made during build
     foreach my $pbpkg (@pkgs) {
         my $vertag = $pkg->{$pbpkg};
@@ -338 +338 @@
                 }
             }
-            $made="$made $ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm"
+            $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"
+            $made="$made $tmp"."_*.deb $tmp"."_*.dsc $tmp"."_*.tar.gz";
         } elsif ($dtype eq "ebuild") {
-            $made="$made $ENV{'PBBUILDDIR'}/portage/*/$pbpkg/$pbpkg-$pbver.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");
-            $made="$made $ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz"
+            $made="$made $ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
         } else {
             die "Unknown dtype format $dtype";
@@ -353 +353 @@
     }
     # 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";
+    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-$vertag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen";
-        my $src = <KEEP>;
+        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
+        $src = <KEEP>;
         chomp($src);
         close(KEEP);
@@ -420 +420 @@
         }
     }
+    my $basesrc = map { basename($_) } split(/ /,$src);
 
     print $LOG "$cmt: $src\n" if ($debug >= 0);
@@ -435 +436 @@
     }
     $port = $sshport->{$ENV{'PBPROJ'}};
-    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $src\"","Preparing $tdir on $mac");
+    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 \"cd $tdir ; if [ -f pbscript ]; then ./pbscript\"; fi","Executing pbscript 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");
     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-$vertag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
-        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$vertag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$vertag";
+        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);
         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_send2ssh("Packages","$odir"."_"."$over");
         pb_rm_rf($ENV{'PBBUILDDIR'}/$odir);
     }
@@ -458 +459 @@
     open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
     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 \$ENV{'HOME'}\n";