X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=blobdiff_plain;f=results2html;h=b330c871abbdae8a74df08a6fa36cb5d52eb6c3b;hp=0e39cb4ed7b1d43b81d10f9d1a2daadc144d644c;hb=HEAD;hpb=32512097fa8fd103d842f3fe1573d3dc3b209439 diff --git a/results2html b/results2html index 0e39cb4ed7..b330c871ab 100755 --- a/results2html +++ b/results2html @@ -3,23 +3,24 @@ use strict; use warnings; -use HTML::Entities; +use Digest::SHA; +use File::Spec; +use HTML::Entities qw(); +use URI::Escape; + +sub encode_entities { + return HTML::Entities::encode_entities($_[0], "<&>'\""); +} + +my $gitweb_url = 'http://benpfaff.org/cgi-bin/gitweb.cgi?p=pspp;a=blob;f=[FILE];hb=[BRANCH]#l[LINE]'; open (LOG, '<', "LOG"); -open (INDEX, '>','index.html'); open (LOG_HTML, '>', "log.html"); -print INDEX < - - - - -EOF - print LOG_HTML < + @@ -39,63 +40,101 @@ sub read_vars { } return %vars; } - my (%vars) = read_vars ('VARS'); -print INDEX "

Build Properties

\n"; -print INDEX "\n"; -print INDEX "\n"; -foreach my $key (sort (keys (%vars))) { - print INDEX ""; - print INDEX ""; - print INDEX ""; - print INDEX "\n"; -} -print INDEX "
NameValue
", encode_entities ($key), "", encode_entities ($vars{$key}), "
\n"; - -print INDEX "

Build Summary

\n"; -print INDEX "
    \n"; -my ($n_products) = 0; -my ($n_steps) = 0; +my (@products); +my (@steps); my ($new_page) = 0; +my ($result) = "failure"; +my (%dist_files); +my ($dist_dir); +my @dirstack; while () { my $ln = $.; chomp; if (/^ $/) { $new_page = 1; + @dirstack = (); print LOG_HTML "
    \n";
 	next;
     }
 
+    if (/Entering directory `(.*)'$/) {
+        push (@dirstack, $1);
+    } elsif (/Leaving directory `(.*)'$/) {
+        pop (@dirstack);
+    }
+
     my $log_class;
     if ($new_page) {
 	$new_page = 0;
 	$log_class = "step";
-	if (my ($product) = /^Saving (.*)$/) {
-	    print INDEX "\n  
      \n" if !$n_products++;
+	if (my ($name, $product) = /^Saving(?:\s+([^:]*):)?\s+(.*)$/) {
 	    my $href = "$product/index.html";
 	    $href = $product if ! -e $href;
-	    print INDEX "  
    • ";
-	    print INDEX encode_entities ($product), "";
-	    print INDEX " (log)";
-	    print INDEX "
      • \n";
+
+	    my (%p);
+	    $p{NAME} = $name if defined ($name);
+	    $p{PRODUCT} = $product;
+	    $p{HREF} = $href;
+	    $p{LN} = $ln;
+	    push (@products, \%p);
+	    push (@{$steps[$#steps]{CHILDREN}}, \%p) if @steps;
+
+	    if (defined ($name) && $name eq 'source distribution') {
+		open (DIST, '-|', "zcat $product | tar tf -");
+		while (my $line = ) {
+		    chomp $line;
+		    $line =~ s%^([./])*%%; # Trim leading ./
+		    $dist_files{$line} = 1;
+		    if (!defined ($dist_dir)) {
+			$dist_dir = (split ('/', $line))[0];
+		    }
+		}
+		close (DIST);
+	    }
 	} else {
-	    print INDEX "
    " if !$n_steps;
-	    print INDEX "
  1. ", encode_entities ($_);
-	    print INDEX " (log)";
-            $n_products = 0;
+	    my (%s);
+	    $s{TITLE} = $_;
+	    $s{LN} = $ln;
+	    push (@steps, \%s);
 	}
+	$result = 'success' if $_ eq 'Success';
     } else {
-	if (my ($diagnostic) = /(error|warning):/) {
-	    if ($n_products) {
-		print INDEX "  \n";
-		$n_products = 0;
+	if (my ($diagnostic) = /(error|warning):/i) {
+	    my (%d);
+	    $d{DIAGNOSTIC} = lc ($diagnostic);
+	    $d{MESSAGE} = $_;
+	    $d{LN} = $ln;
+
+	    if (@dirstack && defined ($dist_dir)
+		&& (my ($match, $file, $line) = /^(([^\s:]+):(\d+):)/)) {
+		$file = File::Spec->rel2abs ($file, $dirstack[$#dirstack]);
+		my (@path) = grep ($_ ne '' && $_ ne '.', split ('/', $file));
+		for (my $i = 1; $i <= $#path; ) {
+		    if ($path[$i] eq '..') {
+			splice (@path, $i - 1, 2);
+			$i-- if $i > 1;
+		    } else {
+			$i++;
+		    }
+		}
+
+		for (my $i = $#path; $i >= 0; $i--) {
+		    if ($path[$i] eq $dist_dir) {
+			my $dist_file = join ('/', @path[$i..$#path]);
+			if (exists ($dist_files{$dist_file})) {
+			    $d{MATCH} = length ($match);
+			    $d{LINE} = $line;
+			    $d{FILE} = $dist_file;
+			}
+			last;
+		    }
+		}
 	    }
-	    print INDEX "
    ";
-	    print INDEX "";
-	    print INDEX encode_entities ($_);
-	    print INDEX "
    \n";
+	    push (@{$steps[$#steps]{CHILDREN}}, \%d);
+
 	    $log_class = "$diagnostic";
 	}
     }
@@ -106,10 +145,95 @@ while () {
 	print LOG_HTML encode_entities ($_), "\n";
     }
 }
-print INDEX "  \n" if $n_products;
-print INDEX "
    2. \n" if $n_steps;
+
+open (INDEX, '>','index.html');
+
+print INDEX <
+
+  
+  
+
+
+EOF
+
+print INDEX "
    Build ", $vars{"build_number"}, ": $result
    \n";
+
+print INDEX "
    Build Properties
    \n";
+print INDEX "\n";
+print INDEX "\n";
+foreach my $key (sort (keys (%vars))) {
+    print INDEX "";
+    print INDEX "";
+    print INDEX "";
+    print INDEX "\n";
+}
+print INDEX "
    NameValue
    ", encode_entities ($key), "", encode_entities ($vars{$key}), "
    \n";
+
+print INDEX "
    Build Products
    \n";
+print INDEX "
      \n";
+foreach my $p (@products) {
+    print INDEX "
    • ";
+    print INDEX encode_entities ($p->{NAME}), ": " if defined ($p->{NAME});
+    print INDEX "{HREF}), "\">";
+    print INDEX encode_entities ($p->{PRODUCT});
+    print INDEX "\n";
+    if ($p->{PRODUCT} =~ /\.tar\.gz$/) {
+	my $sha = Digest::SHA->new(1);
+	$sha->addfile($p->{PRODUCT});
+	print INDEX "
      sha1: ", $sha->hexdigest, "\n";
+
+	$sha = Digest::SHA->new(256);
+	$sha->addfile($p->{PRODUCT});
+	print INDEX "
      sha256: ", $sha->hexdigest, "\n";
+    }
+    print INDEX "
      • \n";
+}
+print INDEX "
    \n";
+
+sub log_link {
+    my ($ln) = @_;
+    return "(log)";
+}
+
+print INDEX "
    Build Summary
    \n";
+print INDEX "
      \n";
+foreach my $s (@steps) {
+    print INDEX "
    1. ", encode_entities ($s->{TITLE});
+    print INDEX " ", log_link ($s->{LN});
+    foreach my $c (@{$s->{CHILDREN}}) {
+	if (defined ($c->{DIAGNOSTIC})) {
+	    print INDEX "
      {DIAGNOSTIC}\">";
+	    if (defined ($c->{MATCH})) {
+		my $href = $gitweb_url;
+		$href =~ s/\[FILE\]/uri_escape ($c->{FILE})/ge;
+		$href =~ s/\[LINE\]/$c->{LINE}/g;
+		$href =~ s/\[BRANCH\]/uri_escape ($vars{'dist_commit'})/e;
+
+		print INDEX '';
+		print INDEX encode_entities (substr ($c->{MESSAGE},
+						     0, $c->{MATCH}));
+		print INDEX '';
+		print INDEX encode_entities (substr ($c->{MESSAGE},
+						     $c->{MATCH}));
+	    } else {
+		print INDEX encode_entities ($c->{MESSAGE});
+	    }
+	    print INDEX " ", log_link ($c->{LN});
+	    print INDEX "
      \n";
+	} else {
+	    print INDEX "
      → {HREF}), "\">";
+	    print INDEX encode_entities ($c->{PRODUCT});
+	    print INDEX " ";
+	    print INDEX log_link ($c->{LN});
+	    print INDEX "
      \n";
+	}
+    }
+    print INDEX "
      2. \n";
+}
+print INDEX "
    \n";
+
 print INDEX <
 
 
 EOF
@@ -125,7 +249,7 @@ print CSS <p {
@@ -175,17 +299,17 @@ a:hover {
         text-decoration: underline
 }
 
+ol>li>p {
+	margin-top: 0;
+	margin-bottom: 0
+}
 .step {
 	font-weight: bold
 }
 .warning {
-	background: yellow;
-	margin-top: 0;
-	margin-bottom: 0
+	background: yellow
 }
 .error {
-	background: orange;
-	margin-top: 0;
-	margin-bottom: 0
+	background: orange
 }
 EOF