 @@ -1,15 +1,15 @@
 #!@AWK@ -f
-# $NetBSD: create-report-html.awk,v 1.10 2008/04/07 19:41:07 joerg Exp $
+# $NetBSD: create-report-html.awk,v 1.11 2008/06/11 19:27:03 joerg Exp $
+#
 # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
+#
 # This code was developed as part of Google's Summer of Code 2007 program.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
+#
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -83,80 +83,139 @@ function print_pre_fail_reason(PKGNAME,
 			else if (chars[i] == "&")
 				printf "&amp;" > html_report
 			else
 				printf "%s", chars[i] > html_report
 			continue
+		}
 		printf "%s", chars[i] > html_report
+	}
 	printf "\n" > html_report
+}
 function print_failed(PKGNAME, cmd, has_pre_clean, has_depends,
     has_checksum,has_configure, has_build, has_install, has_package,
-    has_clean, has_deinstall) {
+    has_clean, has_deinstall, last_error) {
 	cmd = "ls " log_dir "/" PKGNAME " 2>/dev/null"
 	if (status[PKGNAME] == "failed") {
 		cmd = "ls " log_dir "/" PKGNAME " 2>/dev/null"
 		while ((cmd | getline) > 0) {
 			if ($0 == "pre-clean.log")
 				has_pre_clean = 1
 			else if ($0 == "depends.log")
 				has_depends = 1
 			else if ($0 == "checksum.log")
 				has_checksum = 1
 			else if ($0 == "configure.log")
 				has_configure = 1
 			else if ($0 == "build.log")
 				has_build = 1
 			else if ($0 == "install.log")
 				has_install = 1
 			else if ($0 == "package.log")
 				has_package = 1
 			else if ($0 == "clean.log")
 				has_clean = 1
 			else if ($0 == "deinstall.log")
 				has_deinstall = 1
+		}
 		close(cmd)
 		if (has_deinstall)
 			last_error = "deinstall.log"
 		else if (has_clean)
 			last_error = "clean.log"
 		else if (has_package)
 			last_error = "package.log"
 		else if (has_install)
 			last_error = "install.log"
 		else if (has_build)
 			last_error = "build.log"
 		else if (has_configure)
 			last_error = "configure.log"
 		else if (has_checksum)
 			last_error = "checksum.log"
 		else if (has_depends)
 			last_error = "depends.log"
 		else if (has_pre_clean)
 			last_error = "pre-clean.log"
+	}
 	print "<tr class=\"" status[PKGNAME] "\">" > html_report
-	print "<td>" location[PKGNAME] "</td>" > html_report
+	if (last_error)
 		print "<td><a href=\"../" PKGNAME "/" last_error "\"> " location[PKGNAME] "</a></td>" > html_report
 	else
 		print "<td>" location[PKGNAME] "</td>" > html_report
 	print "<td>" PKGNAME "</td>" > html_report
 	if (depth[PKGNAME] == 0)
 		print "<td>&nbsp;</td>" > html_report
 	else
 		print "<td>" depth[PKGNAME] "</td>" > html_report
 	print "<td>" maintainer[PKGNAME] "</td>" > html_report
 	print "<td>" status[PKGNAME] "</td>" > html_report
 	print_failed_log_line(PKGNAME, "pre-clean", has_pre_clean)
 	print_failed_log_line(PKGNAME, "depends", has_depends)
 	print_failed_log_line(PKGNAME, "checksum", has_checksum)
 	print_failed_log_line(PKGNAME, "configure", has_configure)
 	print_failed_log_line(PKGNAME, "build", has_build)
 	print_failed_log_line(PKGNAME, "install", has_install)
 	print_failed_log_line(PKGNAME, "package", has_package)
 	print_failed_log_line(PKGNAME, "clean", has_clean)
 	print_failed_log_line(PKGNAME, "deinstall", has_deinstall)
 	print "</tr>" > html_report
 	if (status[PKGNAME] == "indirect-failed") {
 		print "<tr class=\"" status[PKGNAME] "\">" > html_report
 		printf "<td>&nbsp;</td>" > html_report
 		printf "<td colspan=\"13\"> Failed: " > html_report
 		printf "%s", failed_pkgs[PKGNAME] > html_report
 		print "</td>" > html_report
 		print "</tr>" > html_report
+	}
 	if (status[PKGNAME] == "prefailed") {
 		print "<tr class=\"" status[PKGNAME] "\">" > html_report
 		printf "<td>&nbsp;</td>" > html_report
 		printf "<td colspan=\"13\">" > html_report
 		print_pre_fail_reason(PKGNAME)
 		print "</td>" > html_report
 		print "</tr>" > html_report
+	}
+}
 function compute_direct_failure(CUR, dep, cur_dep, cur_depends, found, i) {
 	if (failed_pkgs[CUR] != "")
 		return
 	split(depends[CUR], cur_depends, "[ \t]+")
 	for (dep in cur_depends) {
 		cur_dep = cur_depends[dep]
 		if (status[cur_dep] == "failed") {
 			failed_pkgs[CUR] = failed_pkgs[CUR] " " cur_dep
 		} else if (status[cur_dep] == "indirect-failed") {
 			compute_direct_failure(cur_dep)
 			failed_pkgs[CUR] = failed_pkgs[cur_dep] " " failed_pkgs[CUR]
+		}
+	}
 	split(failed_pkgs[CUR], cur_depends, "[ \t]+")
 	failed_pkgs[CUR] = ""
 	for (dep in cur_depends) {
 		cur_dep = cur_depends[dep]
 		found[cur_dep] = 1
+	}
 	i = 0
 	for (dep in found) {
 		if (++i == 10) {
 			failed_pkgs[CUR] = failed_pkgs[CUR] " ..."
 			break;
+		}
 		failed_pkgs[CUR] = failed_pkgs[CUR] " " dep
+	}
+}
 BEGIN {
 	meta_dir = ARGV[1]
 	log_dir = ARGV[2]
 	report_file = meta_dir "/report"
 	html_report = meta_dir "/report.html"
 	status_file = meta_dir "/status"
 	tmp_sort = meta_dir "/tmp_sort"
 	pkgs_done = 0
 	pkgs_failed = 0
 	pkgs_prefailed = 0
 	pkgs_indirect_failed = 0
 	pkgs_indirect_prefailed = 0
 @@ -176,39 +235,42 @@ BEGIN {
 	while ((getline < report_file) > 0) {
 		if ($0 ~ "^PKGNAME=")
 			cur = substr($0, 9)
 		else if ($0 ~ "^MAINTAINER=")
 			maintainer[cur] = substr($0, 12)
 		else if ($0 ~ "^PKG_LOCATION=")
 			location[cur] = substr($0, 14)
 		else if ($0 ~ "^PKG_DEPTH=")
 			depth[cur] = substr($0, 11) - 1
 		else if ($0 ~ "^BUILD_STATUS=")
 			status[cur] = substr($0, 14)
 		else if ($0 ~ "^PKG_FAIL_REASON=")
 			pre_fail_reason[cur] = substr($0, 17)
 		else if ($0 ~ "^DEPENDS=")
 			depends[cur] = substr($0, 9)
+	}
 	close(report_file)
 	for (pkg in status) {
 		if (status[pkg] == "done")
 			++pkgs_done
 		else if (status[pkg] == "failed")
 			++pkgs_failed
 		else if (status[pkg] == "prefailed")
 			++pkgs_prefailed
-		else if (status[pkg] == "indirect-failed")
+		else if (status[pkg] == "indirect-failed") {
 			compute_direct_failure(pkg)
 			++pkgs_indirect_failed
-		else if (status[pkg] == "indirect-prefailed")
+		} else if (status[pkg] == "indirect-prefailed")
 			++pkgs_indirect_prefailed
+	}
 	print "<html>" > html_report
 	print "  <head>" > html_report
 	printf("    <title> pkgsrc bulk build for %s from %s</title>\n",
 	    pkgsrc_platform, pkgsrc_build_start_iso) > html_report
 	print "  </head>" > html_report
 	print "  <body>" > html_report
 	printf("    <h1> pkgsrc bulk build for %s</h1>\n", pkgsrc_platform) > html_report
 	printf("    <h2> Build start: %s</h2>\n", pkgsrc_build_start_iso) > html_report
 	printf("    <h2> Build end: %s</h2>\n", pkgsrc_build_end_iso) > html_report
 	print "    <hr />" > html_report

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.39 2008/04/18 06:30:47 bjs Exp $
+# $NetBSD: Makefile,v 1.40 2008/06/11 19:27:03 joerg Exp $
-DISTNAME=	pbulk-0.30
+DISTNAME=	pbulk-0.31
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=	Modular bulk build framework
 PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=		${WRKDIR}/pbulk
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	YES