# HG changeset patch # User Chris Cannam # Date 1414675525 0 # Node ID e58ce2aebd18140a8c214d5f449f340671d5a54c # Parent 7ad02f9ac051c0e929c536dff7d6d7184440afd0# Parent a76b96026c2d565a3493322aa2e0a722f98299f8 Merge from default branch diff -r 7ad02f9ac051 -r e58ce2aebd18 SCRIPTS/include.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/SCRIPTS/include.sh Thu Oct 30 13:25:25 2014 +0000 @@ -0,0 +1,17 @@ +#!/bin/bash + +vcs_id() { + dir="$1" + ( cd "$dir" ; + if [ -d .hg ]; then + hg id | awk '{ print $1; }' + elif [ -d .git ]; then + git rev-parse --short HEAD + elif [ -d .svn ]; then + svn info | grep ^Revision | awk '{ print $2; }' + else + echo "unknown" + fi + ) +} + diff -r 7ad02f9ac051 -r e58ce2aebd18 SCRIPTS/process.sh --- a/SCRIPTS/process.sh Thu Oct 30 11:07:40 2014 +0000 +++ b/SCRIPTS/process.sh Thu Oct 30 13:25:25 2014 +0000 @@ -12,6 +12,8 @@ mydir=$(dirname "$0") case "$mydir" in /*);; *) mydir=$(pwd)/"$mydir";; esac +. "$mydir"/include.sh + have_all=true for program in make perl git svn hg zip tar ; do if ! $program --version >/dev/null 2>&1; then @@ -514,21 +516,6 @@ fi } -vcs_id() { - dir="$1" - ( cd "$dir" ; - if [ -d .hg ]; then - hg id | awk '{ print $1; }' - elif [ -d .git ]; then - git rev-parse --short HEAD - elif [ -d .svn ]; then - svn info | grep ^Revision | awk '{ print $2; }' - else - echo "unknown" - fi - ) -} - package() { dir="$1" id=$(vcs_id "$dir") diff -r 7ad02f9ac051 -r e58ce2aebd18 SCRIPTS/summarise.sh --- a/SCRIPTS/summarise.sh Thu Oct 30 11:07:40 2014 +0000 +++ b/SCRIPTS/summarise.sh Thu Oct 30 13:25:25 2014 +0000 @@ -3,6 +3,8 @@ mydir=$(dirname "$0") case "$mydir" in /*);; *) mydir=$(pwd)/"$mydir";; esac +. "$mydir"/include.sh + plugindirs="$@" if [ -z "$plugindirs" ]; then plugindirs=$(cat .hgsub | grep -v vamp-plugin-sdk | grep -v vamp-plugin-tester | awk '{ print $1; }') @@ -21,64 +23,153 @@ - - +

Plugin Library

+ EOF for p in $platforms ; do - echo "" + echo "" done -echo ""; +echo "" +echo "" + +for p in $platforms ; do + echo "" + echo "" + echo "" + echo "" +done + +echo "" yes="✔" no="✘" unknown="?" +missing="–" +dl="↧" -for dir in $plugindirs ; do - dir=${dir%/*} - echo "" - for p in $platforms ; do - reportdir="REPORTS/$p" - summary="$reportdir/$dir.summary.txt" - echo "" + for p in $platforms ; do + reportdir="REPORTS/$p" + summary="$reportdir/$dir.summary.txt" + if [ -f "$summary" ]; then + outcome=$(cat "$summary" | awk -F: '{ print $2; }' | sed 's/^ *//' | fmt -100) + echo "" else - echo "$unknown" + echo "" + echo "" + echo "" + echo "" fi - echo "" done echo "" + if [ "$oddeven" = odd ]; then + oddeven=even + else + oddeven=odd + fi done echo "

	$p	$p
	Build	Test	Check	Package
$dir	" - if [ -f "$summary" ]; then - outcome=$(cat "$summary" \| awk -F: '{ print $2; }' \| sed 's/^ //') - echo "" - case "$outcome" in - BUILD_FAILED) echo "$no";; - _FAILED) echo "$yes";; - OK) echo "$yes";; - ) echo "$unknown";; - esac - echo "" +# The possible outcomes are: +# +# OK - built, passed tests, passed env checks +# BUILD_FAILED - build failed so unable to test +# TEST_FAILED - build succeeded, tests failed, env checks passed +# ENV_FAILED - build succeeded, tests passed, env checks failed +# TEST_FAILED ENV_FAILED - build succeeded, tests and env checks failed + +emit_build() { + reportdir="$1" + dir="$2" + outcome="$3" + echo "" + case "$outcome" in + BUILD_FAILED) echo "$no";; + _FAILED) echo "$yes";; + OK) echo "$yes";; + ) echo "$unknown";; + esac + echo "" +} + +emit_test() { + reportdir="$1" + dir="$2" + outcome="$3" + case "$outcome" in + BUILD_FAILED) echo "$missing";; + ) echo "" case "$outcome" in - BUILD_FAILED) echo "$no";; TEST_FAILED) echo "$no";; _FAILED) echo "$yes";; OK) echo "$yes";; ) echo "$unknown";; esac - echo "" + echo "" ;; + esac +} + +emit_env() { + reportdir="$1" + dir="$2" + outcome="$3" + echo "" + case "$outcome" in + BUILD_FAILED) echo "$missing";; + ) echo "" case "$outcome" in - FAILED) echo "$no";; + ENV_FAILED) echo "$no";; + FAILED) echo "$yes";; OK) echo "$yes";; ) echo "$unknown";; esac - echo "" + echo "" ;; + esac +} + +emit_package() { + platform="$1" + dir="$2" + outcome="$3" + case "$outcome" in + OK) + id=$(vcs_id "$dir") + package=$(echo "PACKAGES/$platform/$dir-$platform-$id".) + echo "package is $package" 1>&2 + if [ -f "$package" ]; then + echo "$dl" + fi + ;; + ) ;; + esac +} + +oddeven=odd + +for dir in $plugindirs ; do + dir=${dir%/} + echo "
$dir	" + emit_build "$reportdir" "$dir" "$outcome" + echo "	" + emit_test "$reportdir" "$dir" "$outcome" + echo "	" + emit_env "$reportdir" "$dir" "$outcome" + echo "	" + emit_package "$p" "$dir" "$outcome" + echo "	$missing	$missing	$missing	$missing