Changeset 1537 in ProjectBuilder

Timestamp:

May 13, 2012, 11:55:55 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb: Set pb_stop_on_error, add option to continue through errors. Add documentation of the newproj, cms2build and build2pkg steps. Only try to apply patches if the apply script exists. Warn if we would prune to the first listed VM rather than ignoring later ones silently. Only try to sign changes files if they exist, and only try to sign things if there is something to sign. (Eric Anderson)
• CMS.pm: provide stack trace on error. (Eric Anderson)

Location:

devel/pb

Files:

• bin/pb (modified) (7 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -40 +40 @@
 
 # Global variables
+$Global::pb_stop_on_error = 1;
 my %opts;                   # CLI Options
 my $action;                 # action to realize
@@ -159 +160 @@
 
 Only valid with the checkssh action, it alllows to automatically relaunch the build of the failed packages
+
+=item B<--no-stop-on-error>
+
+Continue through errors with best effort.
 
 =back 
@@ -460 +465 @@
  vmopt default = -m 384
 
+=head1 COMMAND DETAILS
+
+=head2 newproj
+
+The newproj command creates a new project-builder project.  To run this command you first need to define two variables in your ~/.pbrc file:
+
+ pbconfurl I<project> = file:///home/anderse/.git/project-builder-config/I<project>
+ pbdefdir default = $ENV{HOME}/cache-project-builder
+
+The first line defines the version controlled configuration information and the second defines the root directory for project-builder to use.
+
+You can then run the command:
+
+ % pb -p I<$project> -r I<$version> newproj
+
+to create the new project. Running the newproj command will then generate the file $pbdefdir/$project/pbconf/$version/$project.pb.  You will need to edit that file in order to run any of the later commands.
+
+=head2 cms2build
+
+The cms2build command takes your files from the content management system and makes the two tar files that are necessary for building files. Before running this command, you need to run the newproj command, and edit the $project.pb configuration file. In particular, you need to set the pburl, pbrepo, pbwf, pbpackager, projver, projtag, testver, deliver, and defpkgdir lines as described in the configuration file. Then you can run a command like:
+
+ % pb -p $project -r $version cms2build
+
+To create the $pbdefdir/$project/delivery/$project-$version.{,pbconf}.tar.gz files, the $version-$projtag.pb and pbrc files in the same directory.
+
+=head2 build2pkg
+
+The build2pkg command takes the tar files created in the cms2build step and attempts to build the binary packages for your current operating system. In order for this step to work, you may need to edit the files in one of the $pbdefdir/$project/pbconf/$version/$project/{deb,rpm,pkg} directories. Those files will be used to try to build your package. Note that if you change those files, you need to re-run the cms2build step.
+
+
 =head1 AUTHORS
 
@@ -499 +534 @@
         "version|V=s" => \$opts{'V'},
         "keep|k" => \$opts{'k'},
+        "stop-on-error!" => \$Global::pb_stop_on_error,
 ) || pb_syntax(-1,0);
 
@@ -1356 +1392 @@
             if (@f) {
                 # We have patches...
-                if ($debsrcfmt =~ /^1.*/) {
+                my $patch_file = "debian/patches/pbapplypatch";
+                if (($debsrcfmt =~ /^1.*/) && (-x $patch_file)) {
                     # In that case we need to apply the patches ourselves locally
-                    pb_system("cat debian/patches/pbapplypatch","APPLY","verbose");
-                    pb_system("debian/patches/pbapplypatch","Applying patches to $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} tree");
+                    pb_system("cat $patch_file","APPLY","verbose");
+                    pb_system("$patch_file","Applying patches to $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} tree");
                 }
                 # ...so modify the name of files to be Debian compliant
@@ -2264 +2301 @@
     die "No VM/VE/RM defined, unable to launch" if (not defined $v);
     # Keep only the first VM in case many were given
-    $v =~ s/,.*//;
+    if ($v =~ /,/) {
+        pb_log(0,"WARNING: pruning to just the first of several vms listed ($v)\n");
+        $v =~ s/,.*//;
+    }
 
     my $pbos = pb_distro_get_context($v);
@@ -4042 +4082 @@
     my $changes = "";
     foreach my $c (split(/ /,$made)) {
-        $changes .= " $ENV{'PBBUILDDIR'}/$c" if ($c =~ /\.changes$/);
+        $changes .= " $ENV{'PBBUILDDIR'}/$c" if (($c =~ /\.changes$/) && (-f "$ENV{PBBUILDDIR}/$c"));
     }
     my $debsigncmd = pb_check_req("debsign",1);
-    pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages");
+    pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages") if ($changes ne "");
 } else {
     pb_log(0,"I don't know yet how to sign packages for type $pbos->{'type'}.\nPlease give feedback to dev team\n");

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -391 +391 @@
 if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
     if (! -f "$dest/ChangeLog") {
-        open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
+        open(CL,"> $dest/ChangeLog") || confess "Unable to create $dest/ChangeLog";
         # We need a minimal version for debian type of build
         print CL "\n";