diff --git a/.appveyor_msys_build.sh b/.appveyor_msys_build.sh index 4ee520074..45359a8e0 100644 --- a/.appveyor_msys_build.sh +++ b/.appveyor_msys_build.sh @@ -1,13 +1,17 @@ export PATH=/c/msys64/mingw$ABI/bin:/c/projects/mpir/bin/:$PATH cd /c/projects/mpir + echo && echo build: ./autogen.sh ./autogen.sh + case "$LIBRARY" in "static") LIB="--enable-static --disable-shared";; "shared") LIB="--disable-static --enable-shared";; esac + echo && echo build: ./configure ABI=$ABI $LIB $CONFIG_CXX $CONFIG_GMP ./configure ABI=$ABI $LIB $CONFIG_CXX $CONFIG_GMP + echo && echo build: make make # should work but falsely requires texlive ?!? @@ -15,13 +19,16 @@ make #DISTCHECK_CONFIGURE_FLAGS="ABI=$ABI $LIB" make distcheck echo && echo build: make check make check + echo && echo build: make dist make dist -if ! test -z "$CONFIG_GMP"; then - if ! test -z "$CONFIG_CXX"; then + +if test "x$CONFIG_GMP" != "x"; then + if test "x$CONFIG_CXX" != "x"; then MODE="C++" else MODE="" fi + echo && echo build: make install DESTDIR=$(pwd)/bin$ABI$MODE-$LIBRARY make install DESTDIR=$(pwd)/bin$ABI$MODE-$LIBRARY fi diff --git a/appveyor.yml b/appveyor.yml index c8d0ef00a..c62862bdc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,12 +7,6 @@ environment: YASM_DOWNLOAD: http://www.tortall.net/projects/yasm/releases/%YASM_BINARY% MINGW_PREREQ: zip lzip matrix: - - COMPILER: MinGW-w64 - ABI: 32 - LIBRARY: shared - - COMPILER: MinGW-w64 - ABI: 64 - LIBRARY: static - COMPILER: MinGW-w64 ABI: 32 LIBRARY: static