>From b8efcae21013251c16e5626ba36bf35ae51d13fc Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <address@hidden>
Date: Mon, 30 Aug 2010 21:37:50 +0200
Subject: [PATCH 1/2] Turn mode into first-class, host-dependent criterion.

* autobuild: In overall summary, also key off of mode for each
build type.  In all other summaries, also print the mode.
---
 autobuild |  134 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 78 insertions(+), 56 deletions(-)

diff --git a/autobuild b/autobuild
index 7e71b4e..fc4f8f1 100755
--- a/autobuild
+++ b/autobuild
@@ -117,6 +117,8 @@ my (%Projects);
 my (%Revisions);
 my (%Hosttypes);
 my (%Hostnames);
+my (%Hostmodes);
+my (%Modes);
 
 foreach $arg (@ARGV) {
     my (@files);
@@ -266,6 +268,8 @@ foreach $arg (@ARGV) {
 	$Projects{$project} = 0;
 	${$Revisions{$project}}{$revision} = 0;
 	${$Hosttypes{$project}}{$hosttype} = 0;
+	${$Hostmodes{$project}{$hosttype}}{$mode} = 0;
+	${$Modes{$project}}{$mode} = 0;
 	${$Hostnames{$project}}{$hostname} = 0;
     }
 }
@@ -274,7 +278,7 @@ exit 0 if $DryRun;
 
 delete $Projects{"unknown"} if $SkipUnknown;
 
-my ($project, $revision, $hosttype, $hostname);
+my ($project, $revision, $hosttype, $mode, $hostmode, $hostname);
 
 if (!$InlineHTML) {
     print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
@@ -294,6 +298,7 @@ if (!$InlineHTML) {
     print "<tr bgcolor=\"lightblue\">\n";
     print "<td>Project</td>\n";
     print "<td>Build type</td>\n";
+    print "<td>Mode</td>\n";
     print "<td>Revision</td>\n";
     print "<td>System</td>\n";
     print "<td>Build date</td>\n";
@@ -313,67 +318,78 @@ if (!$InlineHTML) {
 	print "<td><a href=\"#$project\">$project</a></td>\n";
 
 	foreach $hosttype (sort keys %{$Hosttypes{$project}}) {
-	    my %DoneType;
+	    my $firstmode = 1;
 
-	    if ($first) {
-		print "<td><a href=\"#$project-$hosttype\">$hosttype</a>";
-	    } else {
-		if ($bit) {
-		    print "<tr bgcolor=\"lightgrey\">\n";
-		} else {
-		    print "<tr>\n";
-		}
-		print "<td></td>\n";
-		print "<td><a href=\"#$project-$hosttype\">$hosttype</a>";
-		$bit = !$bit;
-	    }
-	    $first = 0;
-
-	    foreach $file (reverse sort @Files) {
-		next unless $Project{$file} eq $project;
-		next unless $Hosttype{$file} eq $hosttype;
-		next unless !$DoneType{$hosttype};
-		$DoneType{$hosttype} = 1;
-
-		my ($Project);
-		my ($Revision);
-		my ($Mode);
-		my ($Hosttype);
-		my ($Buildtype);
-		my ($Hostname);
-		my ($Timestamp);
-		my ($Status);
-
-		$Revision = $Revision{$file};
-		$Mode = $Mode{$file};
-		$Hostname = $Hostname{$file};
-		$Buildtype = $Buildtype{$file};
-		$Timestamp = $Timestamp{$file};
-		$Status = $Status{$file};
-
-		if ($hosttype eq $Buildtype) {
-		    print "</td>\n";
+	    foreach $hostmode (sort keys %{$Hostmodes{$project}{$hosttype}}) {
+		my %DoneType;
+
+		if ($first) {
+		    print "<td><a href=\"#$project-$hosttype\">$hosttype</a>";
 		} else {
-		    print " from $Buildtype</td>\n";
+		    if ($bit) {
+			print "<tr bgcolor=\"lightgrey\">\n";
+		    } else {
+			print "<tr>\n";
+		    }
+		    print "<td></td>\n";
+		    if ($firstmode) {
+			print "<td><a href=\"#$project-$hosttype\">$hosttype</a>";
+		    } else {
+			print "<td>";
+		    }
+		    $bit = !$bit;
 		}
-		print "<td><a href=\"#$project-$Revision\">$Revision</a></td>\n";
-		print "<td><a href=\"#$project-$Hostname\">$Hostname</a></td>\n";
-		print "<td>$Timestamp</td>\n";
-		print "<td><a href=\"$file\">\n";
-		if ($Status eq "ok") {
-		    print "<font color=\"green\">Success</font>\n";
-		} elsif ($Status eq "almost") {
-		    print "<font color=\"orange\">Almost</font>\n";
-		} elsif ($Status eq "built") {
-		    print "<font color=\"yellow\">Built</font>\n";
-		} else {
-		    print "<font color=\"red\">Failure</font>\n";
+		$first = 0;
+		$firstmode = 0;
+
+		foreach $file (reverse sort @Files) {
+		    next unless $Project{$file} eq $project;
+		    next unless $Hosttype{$file} eq $hosttype;
+		    next unless $Mode{$file} eq $hostmode;
+		    next unless !$DoneType{$hosttype}{$hostmode};
+		    $DoneType{$hosttype}{$hostmode} = 1;
+
+		    my ($Project);
+		    my ($Revision);
+		    my ($Mode);
+		    my ($Hosttype);
+		    my ($Buildtype);
+		    my ($Hostname);
+		    my ($Timestamp);
+		    my ($Status);
+
+		    $Revision = $Revision{$file};
+		    $Mode = $Mode{$file};
+		    $Hostname = $Hostname{$file};
+		    $Buildtype = $Buildtype{$file};
+		    $Timestamp = $Timestamp{$file};
+		    $Status = $Status{$file};
+
+		    if ($hosttype eq $Buildtype) {
+			print "</td>\n";
+		    } else {
+			print " from $Buildtype</td>\n";
+		    }
+		    print "<td>$Mode</td>\n";
+		    print "<td><a href=\"#$project-$Revision\">$Revision</a></td>\n";
+		    print "<td><a href=\"#$project-$Hostname\">$Hostname</a></td>\n";
+		    print "<td>$Timestamp</td>\n";
+		    print "<td><a href=\"$file\">\n";
+		    if ($Status eq "ok") {
+			print "<font color=\"green\">Success</font>\n";
+		    } elsif ($Status eq "almost") {
+			print "<font color=\"orange\">Almost</font>\n";
+		    } elsif ($Status eq "built") {
+			print "<font color=\"yellow\">Built</font>\n";
+		    } else {
+			print "<font color=\"red\">Failure</font>\n";
+		    }
+		    print "</a></td>\n";
+		    print "</tr>";
+		    print "\n";
 		}
-		print "</a></td>\n";
-		print "</tr>";
 		print "\n";
 	    }
-	    print "\n";
 	}
     }
     print "</table>\n";
@@ -409,6 +425,7 @@ foreach $project (sort keys %Projects) {
 	print "<table border=\"0\">\n";
 	print "<tr bgcolor=\"lightblue\">\n";
 	print "<td>System</td>\n";
+	print "<td>Mode</td>\n";
 	print "<td>Build host</td>\n";
 	print "<td>Build date</td>\n";
 	print "<td>Results</td>\n";
@@ -447,6 +464,7 @@ foreach $project (sort keys %Projects) {
 	    } else {
 		print " from $Buildtype</td>\n";
 	    }
+	    print "<td>$Mode</td>\n";
 	    print "<td>$Hostname</td>\n";
 	    print "<td>$Timestamp</td>\n";
 	    print "<td><a href=\"$file\">\n";
@@ -479,6 +497,7 @@ foreach $project (sort keys %Projects) {
 	print "<tr bgcolor=\"lightblue\">\n";
 	print "<td>Revision</td>\n";
 	print "<td>Cross?</td>\n";
+	print "<td>Mode</td>\n";
 	print "<td>Build host</td>\n";
 	print "<td>Build date</td>\n";
 	print "<td>Results</td>\n";
@@ -518,6 +537,7 @@ foreach $project (sort keys %Projects) {
 	    } else {
 		print "$hosttype from $Buildtype</td>\n";
 	    }
+	    print "<td>$Mode</td>\n";
 	    print "<td>$Hostname</td>\n";
 	    print "<td>$Timestamp</td>\n";
 	    print "<td><a href=\"$file\">\n";
@@ -550,6 +570,7 @@ foreach $project (sort keys %Projects) {
 	print "<tr bgcolor=\"lightblue\">\n";
 	print "<td>Version</td>\n";
 	print "<td>System</td>\n";
+	print "<td>Mode</td>\n";
 	print "<td>Build date</td>\n";
 	print "<td>Results</td>\n";
 	print "</tr>\n";
@@ -588,6 +609,7 @@ foreach $project (sort keys %Projects) {
 	    } else {
 		print " from $Buildtype</td>\n";
 	    }
+	    print "<td>$Mode</td>\n";
 	    print "<td>$Timestamp</td>\n";
 	    print "<td><a href=\"$file\">\n";
 	    if ($Status eq "ok") {
-- 
1.7.2.1.222.g9988