work on output formatting

[pspp] / build-pspp

diff --git a/build-pspp b/build-pspp
index e7c819cc6dbf1792e0efe8d72ff1f66601a305c9..f151cc1f881135bf6019ce6d657eec40967418d5 100755 (executable)
--- a/build-pspp
+++ b/build-pspp
@@ -25,9 +25,6 @@ usage () if $help;
 die "$0: exactly one or two nonoption arguments are required\n"
   if @ARGV != 1 && @ARGV != 2;
 
-my $builder = `hostname`;
-chomp $builder;
-
 # Select build number.
 if (!defined ($build_number)) {
     $build_number = POSIX::strftime("%Y%m%d%H%M%S", localtime);
@@ -55,7 +52,9 @@ VARS->autoflush (1);
 my $logfile = "$resultsdir/LOG";
 open (LOG, '>', $logfile) or die "creating $logfile failed: $!\n";
 
-set_var ("builder", $builder);
+my $build_host = `hostname`;
+chomp $build_host;
+set_var ("build_host", $build_host);
 set_var ("build_number", $build_number);
 
 sub start_step {
@@ -78,17 +77,17 @@ sub set_var {
 }
 
 sub saved_result {
-    my ($product) = @_;
-    start_step ("Saving $product");
+    my ($name, $product) = @_;
+    start_step ("Saving $name: $product");
 }
 
 sub save_result {
-    my ($src, $rm_src) = @_;
+    my ($name, $src, $rm_src) = @_;
     my ($basename) = $src;
     $basename =~ s(^.*/)();
     my ($dst) = "$resultsdir/$basename";
 
-    saved_result ($basename);
+    saved_result ($name, $basename);
     run ("cp -R $src $dst");
 
     if (defined ($rm_src) && $rm_src) {
@@ -99,7 +98,7 @@ sub save_result {
 }
 
 sub save_result_if_exists {
-    my ($src, $rm_src) = @_;
+    my ($name, $src, $rm_src) = @_;
     if (-e $src) {
        save_result (@_);
     } else {
@@ -239,18 +238,18 @@ EOF
     start_step ("Make source tarball");
     run ("cd $builddir/pspp$build_number/_build && make dist", "dist");
     my $tarname = "pspp-$version.tar.gz";
-    $tarball = save_result ("$builddir/pspp$build_number/_build/$tarname", 1);
+    $tarball = save_result ("source distribution", "$builddir/pspp$build_number/_build/$tarname", 1);
 
     # Build user manual
     start_step ("Build user manual");
     run ("cd $builddir/pspp$build_number && cp _build/doc/*.texi doc/");
     run ("cd $builddir/pspp$build_number && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texinfo -o $abs_resultsdir/user-manual --email bug-gnu-pspp\@gnu.org pspp \"GNU PSPP User Manual\"", "user-manual");
-    saved_result ("user-manual");
+    saved_result ("User Manual", "user-manual");
 
     # Build developer's guide
     start_step ("Build developers guide");
     run ("cd $builddir/pspp$build_number && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp-dev.texinfo -o $abs_resultsdir/dev-guide --email bug-gnu-pspp\@gnu.org pspp-dev \"GNU PSPP Developers Guide\"", "dev-guide");
-    saved_result ("dev-guide");
+    saved_result ("Developers Guide", "dev-guide");
 } else {
     $tarball = $ARGV[0];
 }
@@ -278,7 +277,8 @@ if ($build_binary) {
     run ("chmod a-w $builddir/$tarball_dir");
     my $ok = try_run ("cd $builddir/$tarball_dir/_build && ../configure --enable-relocatable --prefix=''", "bin-configure");
     for my $basename ("config.h", "config.log") {
-       save_result_if_exists ("$builddir/$tarball_dir/_build/$basename");
+       save_result_if_exists ("build configuration",
+                              "$builddir/$tarball_dir/_build/$basename");
     }
     fail () if !$ok;
 
@@ -290,12 +290,12 @@ if ($build_binary) {
 
     start_step ("Make binary distribution");
     run ("cd $builddir/$tarball_dir/_build && tar cfz pspp-$binary_version.tar.gz pspp-$binary_version");
-    save_result ("$builddir/$tarball_dir/_build/pspp-$binary_version.tar.gz", 1);
+    save_result ("binary distribution", "$builddir/$tarball_dir/_build/pspp-$binary_version.tar.gz", 1);
 
     start_step ("Check");
     $ok = try_run ("cd $builddir/$tarball_dir/_build && make check", "check");
     for my $basename ("tests/testsuite.log", "tests/testsuite.dir") {
-       save_result_if_exists ("$builddir/$tarball_dir/_build/$basename");
+       save_result_if_exists ("test logs", "$builddir/$tarball_dir/_build/$basename");
     }
     fail () if !$ok;