Changeset 288

Timestamp:

12/01/07 18:30:51 (5 years ago)

Author:

bruno

Message:

• Document -i option
• send packages before halting the VM (useful when you wait for them :-)

Location:

devel/pb

Files:

• bin/pb (modified) (4 diffs)
• lib/ProjectBuilder/Base.pm (modified) (4 diffs)

devel/pb/bin/pb

@@ -348 +348 @@
         }
         close(PKG);
+
+        # Final cleanup
+        pb_rm_rf($dest) if (-d $dest);
     }
 }
@@ -596 +599 @@
         close(KEEP);
         pb_system("ssh -q -p $nport $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac");
+        pb_send2ssh("Packages","$odir"."_"."$over");
         if (! $vmexist) {
             pb_system("ssh -q -p $nport $mac \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $vm halt (pid $vmpid)");
         }
-        pb_send2ssh("Packages","$odir"."_"."$over");
         pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
     }
@@ -870 +873 @@
     print "pb (aka project-builder) Version $projectbuilderver-$projectbuilderrev\n";
     print "\n";
-    print "Syntax: pb [-vhqt][-r pbroot][-p project][[-s script -a account -P port] -m \"mach-1[,...]\"] <action> [<pkg1>...]\n";
+    print "Syntax: pb [-vhqt][-r pbroot][-p project][[-s script -a account -P port] -m \"mach-1[,...]\"][-i iso] <action> [<pkg1>...]\n";
     print "\n";
     print "-h : This help file\n";
@@ -884 +887 @@
     print "             to execute on the related VMs.\n";
     print "\n";
+    print "-i iso     : Name of the ISO image of the distribution you want\n";
+    print "             to install on the related VMs.\n";
+    print "\n";
     print "-a account : Name of the account to use\n";
     print "             to connect on the related VMs.\n";

devel/pb/lib/ProjectBuilder/Base.pm

@@ -277 +277 @@
 
 # PBGRP is replaced by the RPM group of apps
+# Cf: http://fedoraproject.org/wiki/RPMGroups
 #filter PBGRP = Applications/Archiving
 
@@ -581 +582 @@
 %build
 %configure
-make %{?_smp_mflags} VERSION=%{version}
+make %{?_smp_mflags}
 
 %install
@@ -910 +911 @@
     }
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-    # Nothing to do
+    if (! -f "$dest/ChangeLog") {
+        pb_system("echo ChangeLog for $pkgdir > $dest/ChangeLog","Empty ChangeLog file created");
+    }
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
     my $tmp=basename($pkgdir);
@@ -916 +919 @@
     if (! -f "$dest/ChangeLog") {
         if (-x "/usr/bin/cvs2cl") {
-            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
+            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from CVS");
         } else {
             # To be written from pbcl