Mercurial > hg > vamp-build-and-test
changeset 36:56eff3575b55
Toward win64 build eventually
| author | Chris Cannam |
|---|---|
| date | Wed, 06 Aug 2014 16:30:34 +0100 |
| parents | 6fc0d89020f2 |
| children | 5ae8d8a1e411 |
| files | .hgsubstate SCRIPTS/process.sh |
| diffstat | 2 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Wed Aug 06 15:58:31 2014 +0100 +++ b/.hgsubstate Wed Aug 06 16:30:34 2014 +0100 @@ -5,11 +5,11 @@ 564f80bc0da4ab7778779ab08d883fff350cecad pyin 93c8ebc0c2ef4db89d8a1e2d61bca15f9ff088ff qm-vamp-plugins 4cc12d2d64e47b72122320f5e165b0b534811f24 segmenter-vamp-plugin -a19319b701ccdb68c28a091c7c82bce4620ed0a5 silvet +8e94604ccff2588cfb8f3e32de21405a5440af18 silvet b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins 81146373f024be1c82371f04262cf2ae1680cb61 vamp-libxtract-plugins 8bc4ec815b6b695371dc9dda500191892ca5d2a7 vamp-onsetsds-plugin -490e5d01766c5f94ad7247a6385093ce536545d4 vamp-plugin-sdk -925c8dedde9cc14e9f3eaec60ae3cfa373fe92a9 vamp-plugin-tester +2056dfdd42c61acb70fca53002bd279063c3c499 vamp-plugin-sdk +929b95cd25b1f421d0495487ed65fc40e2d37cbc vamp-plugin-tester 886d1071c282201f67504690ea6476417193db18 vamp-test-plugin 4ffac7dedddfbbdffc18f74a71c05e8e0f88bd67 vampy
--- a/SCRIPTS/process.sh Wed Aug 06 15:58:31 2014 +0100 +++ b/SCRIPTS/process.sh Wed Aug 06 16:30:34 2014 +0100 @@ -51,6 +51,7 @@ hostwrapper= hostext= archflags= + identpattern='ELF 32.*Linux' ;; linux64) platform=linux @@ -60,6 +61,7 @@ hostwrapper= hostext= archflags= + identpattern='ELF 64.*Linux' ;; mingw32) platform=mingw @@ -69,6 +71,7 @@ hostwrapper=wine hostext=.exe archflags= + identpattern='PE32.*386.*Windows' ;; mingw64) platform=mingw @@ -78,6 +81,7 @@ hostwrapper=wine hostext=.exe archflags= + identpattern='not known yet' ##!!! ;; osx32) platform=osx @@ -87,6 +91,7 @@ hostwrapper= hostext= archflags="-arch i386" + identpattern='not known yet' ##!!! ;; osx64) platform=osx @@ -97,6 +102,7 @@ hostext= # This is a difficult choice for various reasons... have to ponder archflags="-mmacosx-version-min=10.6 -arch x86_64 -arch i386" + identpattern='not known yet' ##!!! ;; esac; @@ -228,7 +234,13 @@ dir="$1" for x in "$dir/"*"$pluginext"; do if [ -f "$x" ]; then - return 0 + if file "$x" | grep -q "$identpattern" ; then + return 0 + else + echo "Plugin $x exists, but fails to match file type for correct platform" + echo "(file type is: `file $x`)" + return 1 + fi fi done return 1 @@ -340,7 +352,7 @@ run_tester "$dir" run_environmental_tests "$dir" else - echo "Build apparently succeeded, but no resulting plugin(s) found" | tee -a "$reportdir/$dir.build.txt" + echo "Build apparently succeeded, but no resulting plugin(s) found, or plugin(s) have wrong file type or platform" | tee -a "$reportdir/$dir.build.txt" echo "$dir" >> "$notbuilt" fi else