diff options
author | Mark Linimon <linimon@FreeBSD.org> | 2010-02-20 00:15:58 +0800 |
---|---|---|
committer | Mark Linimon <linimon@FreeBSD.org> | 2010-02-20 00:15:58 +0800 |
commit | 2492e191eea6a42825956663acf33a36e9b778dc (patch) | |
tree | ece915779c1897b9e4f341ecf1360b7c200c258b /Tools | |
parent | 0b3065393b0f24ce8b21825c1cad051d7cb0ae47 (diff) | |
download | freebsd-ports-gnome-2492e191eea6a42825956663acf33a36e9b778dc.tar.gz freebsd-ports-gnome-2492e191eea6a42825956663acf33a36e9b778dc.tar.zst freebsd-ports-gnome-2492e191eea6a42825956663acf33a36e9b778dc.zip |
Bring this up to date with what is in production: add 'queue length'
column from pav; fix first-column formatting.
Feature safe: yes
Diffstat (limited to 'Tools')
-rwxr-xr-x | Tools/portbuild/scripts/dopackagestats | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/Tools/portbuild/scripts/dopackagestats b/Tools/portbuild/scripts/dopackagestats index 292908788e4e..3baac4a41084 100755 --- a/Tools/portbuild/scripts/dopackagestats +++ b/Tools/portbuild/scripts/dopackagestats @@ -6,7 +6,7 @@ # # alpha is obsolete -SUPPORTED_ARCHS="amd64 i386 ia64 sparc64" +SUPPORTED_ARCHS="amd64 i386 ia64 powerpc sparc64" ROOT_DIRECTORY=/var/portbuild OUTFILE=`basename $0 | sed -e "s/^do//"`".html" @@ -34,7 +34,7 @@ write_header () { write_table_begin () { echo "<table border='1' cellpadding='4' cellspacing='1' bgcolor='$TABLEBGCOLOR'>" >> ${TMPFILE} echo "<tr>" >> ${TMPFILE} - echo "<td align='left' width='100' bgcolor='$TABLEBGCOLOR'> </td>" >> ${TMPFILE} + echo "<td align='left' width='120' bgcolor='$TABLEBGCOLOR'> </td>" >> ${TMPFILE} echo "<th width='60' bgcolor='$THCOLOR'>cvs date</th>" >> ${TMPFILE} # MCL removed 20090808 -- this takes way too long # echo "<th width='60' bgcolor='$THCOLOR'>latest log</th>" >> ${TMPFILE} @@ -44,6 +44,7 @@ write_table_begin () { echo "<th bgcolor='$THCOLOR'>errors</th>" >> ${TMPFILE} echo "<th bgcolor='$THCOLOR'>skipped</th>" >> ${TMPFILE} echo "<th bgcolor='$THCOLOR'>not yet built</th>" >> ${TMPFILE} + echo "<th bgcolor='$THCOLOR'>queue length</th>" >> ${TMPFILE} echo "<th bgcolor='$THCOLOR'>running?</th>" >> ${TMPFILE} echo "<th bgcolor='$THCOLOR'>completed?</th>" >> ${TMPFILE} echo "</tr>" >> ${TMPFILE} @@ -192,6 +193,14 @@ write_row () { cellcolor=$TDCOLOR_NOT_DONE fi + # queue length -PAV- + m_not_yet_built="" + queue_length="" + if [ "$completed_flag" = "N" ]; then + m_not_yet_built=`tail -n 1000 /var/portbuild/$arch/$build/builds/latest/make|grep MASTER|grep Queue|tail -1|sed 's|.*remaining=|| ; s|, Queue.*||'` + queue_length=`tail -n 1000 /var/portbuild/$arch/$build/builds/latest/make|grep MASTER|grep Queue|tail -1|sed 's|.*length=||'` + fi; + # now write the row echo "<tr>" >> ${TMPFILE} @@ -262,13 +271,21 @@ write_row () { echo "</td>" >> ${TMPFILE} echo "<td align='right' bgcolor='$cellcolor'>" >> ${TMPFILE} - if [ ! -z "$have_not_yet_built" ]; then + if [ ! -z "$m_not_yet_built" ]; then echo "$n_not_yet_built" >> ${TMPFILE} else echo " " >> ${TMPFILE} fi echo "</td>" >> ${TMPFILE} + echo "<td align='right' bgcolor='$cellcolor'>" >> ${TMPFILE} + if [ ! -z "$queue_length" ]; then + echo "$queue_length" >> ${TMPFILE} + else + echo " " >> ${TMPFILE} + fi + echo "</td>" >> ${TMPFILE} + echo "<td align='center' bgcolor='$cellcolor'>$running_flag</td>" >> ${TMPFILE} echo "<td align='center' bgcolor='$cellcolor'>$completed_flag</td>" >> ${TMPFILE} |