Mercurial > hg > vamp-build-and-test
changeset 31:090303b184d8
Build tweaks
| author | Chris Cannam |
|---|---|
| date | Wed, 06 Aug 2014 12:45:06 +0100 |
| parents | c143c524e034 |
| children | 6fc0d89020f2 0f1df952e9e9 |
| files | .hgsubstate SCRIPTS/process.sh |
| diffstat | 2 files changed, 25 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Wed Aug 06 11:01:56 2014 +0100 +++ b/.hgsubstate Wed Aug 06 12:45:06 2014 +0100 @@ -1,13 +1,13 @@ 870077df3318592492aaa178d20d7d581a7c8f8f constant-q-cpp -fec395fcdc7c38589bac50541e5c6e19502d9eb6 match-vamp +6ea008aa881763587a08aa8d46d3cca799aa5686 match-vamp ca32a96c123a2c3f7548e37a8d5f4205632bdd9d mazurka-plugins -90c2f0b597f8130c906ff3ea019480bc433d7db2 nnls-chroma -3b37e7be34dad2fc12afced53ade57038e8ae336 pyin +3226fe4e1280454e2de12a961b3fa43518834de3 nnls-chroma +564f80bc0da4ab7778779ab08d883fff350cecad pyin 93c8ebc0c2ef4db89d8a1e2d61bca15f9ff088ff qm-vamp-plugins 4cc12d2d64e47b72122320f5e165b0b534811f24 segmenter-vamp-plugin a19319b701ccdb68c28a091c7c82bce4620ed0a5 silvet b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins -32407651025d8334f4d1f93dedbcd492b24bd93a vamp-libxtract-plugins +81146373f024be1c82371f04262cf2ae1680cb61 vamp-libxtract-plugins 8bc4ec815b6b695371dc9dda500191892ca5d2a7 vamp-onsetsds-plugin 490e5d01766c5f94ad7247a6385093ce536545d4 vamp-plugin-sdk 925c8dedde9cc14e9f3eaec60ae3cfa373fe92a9 vamp-plugin-tester
--- a/SCRIPTS/process.sh Wed Aug 06 11:01:56 2014 +0100 +++ b/SCRIPTS/process.sh Wed Aug 06 12:45:06 2014 +0100 @@ -18,18 +18,31 @@ echo echo "Usage: $0 <platform> [-c] [<dir> ...]" echo - echo " <platform> one of linux32, linux64, mingw32, mingw64, osx32, osx64" + echo " <platform> one of native, linux32, linux64, mingw32, mingw64, osx32, osx64" echo " -c build from clean" echo " <dir> directory to build (default is all of them)" echo echo "Platform usually should match the platform you are running this" echo "script on, unless you have a cross-compile toolset installed and" - echo "this script knows how to run it." + echo "this script knows how to run it. The special platform 'native'" + echo "tries to guess the currently running platform." echo exit 2 } -case "$1" in +platform_arg="$1" + +if [ "$platform_arg" = "native" ]; then + case `uname -a` in + Linux*x86_64*) platform_arg=linux64;; + Linux*) platform_arg=linux32;; + Darwin*) platform_arg=osx64;; + CYG*) platform_arg=mingw32;; + MINGW*) platform_arg=mingw32;; + esac +fi + +case "$platform_arg" in linux32) platform=linux bits=32 @@ -309,9 +322,13 @@ fi for dir in $plugindirs ; do + dir=${dir%/*} echo echo "Processing: $dir" - if build_or_rebuild "$dir"; then + if [ ! -d "$dir" ]; then + echo "Directory $dir not found!" + echo "$dir" >> "$notbuilt" + elif build_or_rebuild "$dir"; then if have_plugin "$dir" ; then echo "$dir" >> "$built" run_tester "$dir"