work on output formatting

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;
 

diff --git a/results2html b/results2html
index 8f8725f82f3067c85358951d6fb711bb138af7a7..abc520d3db5033cad7701e7725f29a09c7113adf 100755 (executable)
--- a/results2html
+++ b/results2html
@@ -6,17 +6,8 @@ use warnings;
 use HTML::Entities;
 
 open (LOG, '<', "LOG");
-open (INDEX, '>','index.html');
 open (LOG_HTML, '>', "log.html");
 
-print INDEX <<EOF;
-<html>
-<head>
-  <link rel="stylesheet" href="build.css">
-</head>
-<body>
-EOF
-
 print LOG_HTML <<EOF;
 <html>
 <head>
@@ -39,22 +30,12 @@ sub read_vars {
     }
     return %vars;
 }
-
 my (%vars) = read_vars ('VARS');
-print INDEX "<h2>Build Properties</h2>\n";
-print INDEX "<table>\n";
-print INDEX "<tr><th>Name</th><th>Value</th></tr>\n";
-foreach my $key (sort (keys (%vars))) {
-    print INDEX "<tr>";
-    print INDEX "<td>", encode_entities ($key), "</td>";
-    print INDEX "<td>", encode_entities ($vars{$key}), "</td>";
-    print INDEX "</tr>\n";
-}
-print INDEX "</table>\n";
 
 my (@products);
 my (@steps);
 my ($new_page) = 0;
+my ($result) = "failure";
 while (<LOG>) {
     my $ln = $.;
     chomp;
@@ -69,11 +50,12 @@ while (<LOG>) {
     if ($new_page) {
        $new_page = 0;
        $log_class = "step";
-       if (my ($product) = /^Saving (.*)$/) {
+       if (my ($name, $product) = /^Saving(?:([^:]*):)?\s+(.*)$/) {
            my $href = "$product/index.html";
            $href = $product if ! -e $href;
 
            my (%p);
+           $p{NAME} = $name if defined ($name);
            $p{PRODUCT} = $product;
            $p{HREF} = $href;
            $p{LN} = $ln;
@@ -85,10 +67,11 @@ while (<LOG>) {
            $s{LN} = $ln;
            push (@steps, \%s);
        }
+       $result = 'success' if $_ eq 'Success';
     } else {
-       if (my ($diagnostic) = /(error|warning):/) {
+       if (my ($diagnostic) = /(error|warning):/i) {
            my (%d);
-           $d{DIAGNOSTIC} = $diagnostic;
+           $d{DIAGNOSTIC} = lc ($diagnostic);
            $d{MESSAGE} = $_;
            $d{LN} = $ln;
            push (@{$steps[$#steps]{CHILDREN}}, \%d);
@@ -104,10 +87,35 @@ while (<LOG>) {
     }
 }
 
+open (INDEX, '>','index.html');
+
+print INDEX <<EOF;
+<html>
+<head>
+  <link rel="stylesheet" href="build.css">
+</head>
+<body>
+EOF
+
+print INDEX "<h1>Build ", $vars{"build_number"}, ": $result</h1>\n";
+
+print INDEX "<h2>Build Properties</h2>\n";
+print INDEX "<table>\n";
+print INDEX "<tr><th>Name</th><th>Value</th></tr>\n";
+foreach my $key (sort (keys (%vars))) {
+    print INDEX "<tr>";
+    print INDEX "<td>", encode_entities ($key), "</td>";
+    print INDEX "<td>", encode_entities ($vars{$key}), "</td>";
+    print INDEX "</tr>\n";
+}
+print INDEX "</table>\n";
+
 print INDEX "<h2>Build Products</h2>\n";
 print INDEX "<ul>\n";
 foreach my $p (@products) {
-    print INDEX "<li><a href=\"", encode_entities ($p->{HREF}), "\">";
+    print INDEX "<li>";
+    print INDEX encode_entities ($p->{NAME}), ": " if defined ($p->{NAME});
+    print INDEX "<a href=\"", encode_entities ($p->{HREF}), "\">";
     print INDEX encode_entities ($p->{PRODUCT});
     print INDEX "</a></li>\n";
 }
@@ -132,7 +140,9 @@ foreach my $s (@steps) {
        } else {
            print INDEX "<p>&rarr; <a href=\"", encode_entities ($c->{HREF}), "\">";
            print INDEX encode_entities ($c->{PRODUCT});
-           print INDEX "</a></p>\n";
+           print INDEX "</a> ";
+           print INDEX log_link ($c->{LN});
+           print INDEX "</p>\n";
        }
     }
     print INDEX "</li>\n";