changeset 60:01e6213c3f91

Merge
author Chris Cannam
date Fri, 12 Sep 2014 08:17:00 +0100
parents 6d9afb9d5571 (current diff) 25ebdd75ba19 (diff)
children bc74506fe975
files SCRIPTS/process.sh
diffstat 3 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsub	Fri Sep 12 08:15:39 2014 +0100
+++ b/.hgsub	Fri Sep 12 08:17:00 2014 +0100
@@ -13,3 +13,4 @@
 pyin = https://code.soundsoftware.ac.uk/hg/pyin
 silvet = https://code.soundsoftware.ac.uk/hg/silvet
 constant-q-cpp = https://code.soundsoftware.ac.uk/hg/constant-q-cpp
+predomino = https://code.soundsoftware.ac.uk/hg/predomino
--- a/.hgsubstate	Fri Sep 12 08:15:39 2014 +0100
+++ b/.hgsubstate	Fri Sep 12 08:17:00 2014 +0100
@@ -2,6 +2,7 @@
 acc12b4d54b4ff19eac66c64749d6afb01d1e1e7 match-vamp
 ca32a96c123a2c3f7548e37a8d5f4205632bdd9d mazurka-plugins
 6408759460777522101d3310de8e6852a1a1af61 nnls-chroma
+e83e6bb1367a5524db9c6f41cec3445eccad1a5f predomino
 00cffb79d0e0d84e63914c0079601145fa6997ae pyin
 df9b98c6baf8766b52a16c15ee50b11837c0a599 qm-vamp-plugins
 6b23b827b108103ae9d1f412dc6c282a21302520 segmenter-vamp-plugin
@@ -9,7 +10,7 @@
 b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins
 81146373f024be1c82371f04262cf2ae1680cb61 vamp-libxtract-plugins
 8bc4ec815b6b695371dc9dda500191892ca5d2a7 vamp-onsetsds-plugin
-5ad35dc275c2cff70f60df19df644da5e2440b52 vamp-plugin-sdk
+e43186ff8854485f4985eddf55b77b589a563857 vamp-plugin-sdk
 929b95cd25b1f421d0495487ed65fc40e2d37cbc vamp-plugin-tester
 bc66d4d9c8f204fdb844aee96668aebbd78809bb vamp-test-plugin
 0df94e3f0fdb6eac02860655503e242a86cbb671 vampy
--- a/SCRIPTS/process.sh	Fri Sep 12 08:15:39 2014 +0100
+++ b/SCRIPTS/process.sh	Fri Sep 12 08:17:00 2014 +0100
@@ -12,6 +12,20 @@
 mydir=$(dirname "$0")
 case "$mydir" in /*);; *) mydir=$(pwd)/"$mydir";; esac
 
+have_all=true
+for program in make unix2dos perl git svn hg zip tar ; do
+    if ! $program --version >/dev/null 2>&1; then
+	if ! $program -v 2>&1 | grep -q version; then
+	    echo " ** $program program not found"
+	    have_all=false
+	fi
+    fi
+done
+if [ "$have_all" != "true" ]; then
+    echo "Not all dependencies found, exiting"
+    exit 1
+fi
+
 do_rebuild=""
 
 usage() {