Mercurial > hg > vamp-build-and-test
changeset 78:ab0dbbb58119
Script updates for mingw64
| author | Chris Cannam |
|---|---|
| date | Thu, 30 Oct 2014 17:39:12 +0000 |
| parents | 2e60b888e526 |
| children | 71000cf7f414 |
| files | SCRIPTS/process.sh SCRIPTS/summarise.sh |
| diffstat | 2 files changed, 30 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/SCRIPTS/process.sh Thu Oct 30 16:06:26 2014 +0000 +++ b/SCRIPTS/process.sh Thu Oct 30 17:39:12 2014 +0000 @@ -58,70 +58,59 @@ esac fi +platform= +bits=32 +altbits= +toolprefix= +pluginext= +hostwrapper= +hostext= +valgrind= +archflags= +identpattern= + case "$platform_arg" in linux32) platform=linux - bits=32 - toolprefix= pluginext=.so - hostwrapper= - hostext= valgrind=valgrind - archflags= identpattern='ELF 32' ;; linux64) platform=linux bits=64 - toolprefix= pluginext=.so - hostwrapper= - hostext= valgrind=valgrind - archflags= identpattern='ELF 64' ;; mingw32) platform=mingw - bits=32 toolprefix=i686-w64-mingw32- pluginext=.dll hostwrapper=wine hostext=.exe - valgrind= - archflags= identpattern='PE32.*386.*Windows' ;; mingw64) platform=mingw bits=64 + altbits=32 # We can usually use a mingw32 Makefile if toolprefix is OK toolprefix=x86_64-w64-mingw32- pluginext=.dll hostwrapper=wine hostext=.exe - valgrind= - archflags= - identpattern='not known yet' ##!!! + identpattern='PE32.*x86-64.*Windows' ;; osx32) platform=osx - bits=32 - toolprefix= pluginext=.dylib - hostwrapper= - hostext= - valgrind= archflags="-arch i386" identpattern='Mach-O .*i386' ;; osx64) platform=osx bits=64 - toolprefix= pluginext=.dylib - hostwrapper= - hostext= - valgrind= # This is a difficult choice for various reasons... have to ponder archflags="-mmacosx-version-min=10.6 -arch x86_64 -arch i386" identpattern='Mach-O 64-bit .*x86_64' @@ -136,6 +125,16 @@ echo "(Platform is $platform, $bits bits)" fi +if [ -z "$pluginext" ]; then + echo "Internal error: pluginext not set for platform $platform" 1>&2 + exit 2 +fi + +if [ -z "$identpattern" ]; then + echo "Internal error: identpattern not set for platform $platform" 1>&2 + exit 2 +fi + if [ t"$1" = t"-c" ]; then echo "(Building from clean)" do_rebuild=yes @@ -192,6 +191,12 @@ build/$platform/Makefile \ build/Makefile.$platform \ Makefile.$platform \ + build/$platform$altbits/Makefile.$platform$altbits \ + build/$platform/Makefile.$platform$altbits \ + build/$platform$altbits/Makefile.$platform \ + build/$platform$altbits/Makefile \ + build/Makefile.$platform$altbits \ + Makefile.$platform$altbits \ Makefile ; do if [ -f "$dir/$f" ]; then echo $f
--- a/SCRIPTS/summarise.sh Thu Oct 30 16:06:26 2014 +0000 +++ b/SCRIPTS/summarise.sh Thu Oct 30 17:39:12 2014 +0000 @@ -59,7 +59,7 @@ yes="<span class=good>✔</span>" no="<span class=bad>✘</span>" unknown="<span class=unknown>?</span>" -missing="<span class=missing>–</span>" +missing="" dl="<span class=dl>↧</span>" # The possible outcomes are: