Mercurial > hg > vamp-build-and-test
changeset 74:7ad02f9ac051 emscripten
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Thu, 30 Oct 2014 11:07:40 +0000 |
| parents | e9d2ba7cce95 (diff) 004555bedba1 (current diff) |
| children | e58ce2aebd18 |
| files | |
| diffstat | 2 files changed, 21 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Wed Oct 29 17:39:34 2014 +0000 +++ b/.hgsubstate Thu Oct 30 11:07:40 2014 +0000 @@ -1,12 +1,12 @@ 2c7803df84b8d2e1b9d19c82a63a985d4c020cec constant-q-cpp -89929e9e54fb42df57d093c2ddbc78059669feba match-vamp +e6a143e4e143eef32a6068270ba74fd0d2c79516 match-vamp ca32a96c123a2c3f7548e37a8d5f4205632bdd9d mazurka-plugins 6408759460777522101d3310de8e6852a1a1af61 nnls-chroma e83e6bb1367a5524db9c6f41cec3445eccad1a5f predomino 00cffb79d0e0d84e63914c0079601145fa6997ae pyin 6c9ab70d23861140f918024c875b7dd92bd6a04d qm-vamp-plugins 11a826034a9d67fc3ba36ceea052ccd4554f82f2 segmenter-vamp-plugin -19fd6cb033c7f00b6629a455006cf2e394886efd silvet +a3229b972463034933584aa59cf8b25323a46e2f silvet b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins 81146373f024be1c82371f04262cf2ae1680cb61 vamp-libxtract-plugins 8bc4ec815b6b695371dc9dda500191892ca5d2a7 vamp-onsetsds-plugin
--- a/SCRIPTS/process.sh Wed Oct 29 17:39:34 2014 +0000 +++ b/SCRIPTS/process.sh Thu Oct 30 11:07:40 2014 +0000 @@ -32,7 +32,7 @@ echo echo "Usage: $0 <platform> [-c] [<dir> ...]" echo - echo " <platform> one of native, linux32, linux64, mingw32, mingw64, osx32, osx64" + echo " <platform> one of native, linux32, linux64, mingw32, mingw64, osx32, osx64, emscripten" echo " -c build from clean" echo " <dir> directory to build (default is all of them)" echo @@ -124,6 +124,19 @@ archflags="-mmacosx-version-min=10.6 -arch x86_64 -arch i386" identpattern='Mach-O 64-bit .*x86_64' ;; + emscripten) + platform=emscripten + bits=32 + toolprefix= + pluginext=.so + hostwrapper= + hostext= + makewrapper=emmake + configwrapper=emconfigure + valgrind= + archflags= + identpattern='not known yet' + ;; esac; shift @@ -173,7 +186,9 @@ configure() { dir="$1" if [ -f "$dir/configure" ] ; then - ( cd "$dir" ; ./configure ) 2>&1 | tee "$reportdir/$dir.configure.txt" + ( cd "$dir" ; $configwrapper ./configure ) 2>&1 | \ + tee "$reportdir/$dir.configure.txt" + return ${PIPESTATUS[0]} fi } @@ -234,7 +249,7 @@ CXXFLAGS="-I${depincdir} -I${depincdir_generic} -I../vamp-plugin-sdk" \ LDFLAGS="-L${deplibdir} -L../vamp-plugin-sdk" \ ARCHFLAGS="$archflags" \ - make -C "$dir" -f "$mfile" $target 2>&1 | \ + $makewrapper make -C "$dir" -f "$mfile" $target 2>&1 | \ tee "$log" return ${PIPESTATUS[0]} else @@ -250,7 +265,7 @@ if configure_maybe "$dir"; then mfile=$(find_makefile "$dir") if [ -n "$mfile" ]; then - if make -C "$dir" -f "$mfile" clean; then + if $makewrapper make -C "$dir" -f "$mfile" clean; then build "$dir" else echo "Failed to 'make clean' in $dir!" | tee "$log"