From: Klas Lindfors Date: Thu, 20 Sep 2012 09:28:29 +0000 (+0200) Subject: use stub backend. try to install wine X-Git-Tag: v1.8.0~17 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ca149f84453800fcb1529c84bcd5adcc0a678f7;p=yubikey-personalization use stub backend. try to install wine --- diff --git a/.travis.yml b/.travis.yml index feff2ae..7f7ab50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ compiler: env: - LIBUSB=libusb EXTRA=libusb-dev - LIBUSB=libusb-1.0 EXTRA=libusb-1.0-0-dev - - LIBUSB=win32 EXTRA=libusb-1.0-0-dev - - LIBUSB=win64 EXTRA=libusb-1.0-0-dev + - LIBUSB=win32 EXTRA=wine + - LIBUSB=win64 EXTRA=wine script: ./build-and-test.sh before_install: - sudo apt-get update -qq @@ -14,6 +14,6 @@ before_install: matrix: exclude: - compiler: clang - env: LIBUSB=win32 EXTRA=libusb-1.0-0-dev + env: LIBUSB=win32 EXTRA=wine - compiler: clang - env: LIBUSB=win64 EXTRA=libusb-1.0-0-dev + env: LIBUSB=win64 EXTRA=wine diff --git a/build-and-test.sh b/build-and-test.sh index 8806a9f..8bddc23 100755 --- a/build-and-test.sh +++ b/build-and-test.sh @@ -5,12 +5,12 @@ set -e autoreconf -i if [ "x$LIBUSB" = "xwin32" ]; then - ./configure + ./configure --with-backend=stub touch ChangeLog make dist make -f ykpers4win.mk ykpers4win32 elif [ "x$LIBUSB" = "xwin64" ]; then - ./configure + ./configure --with-backend=stub touch ChangeLog make dist make -f ykpers4win.mk ykpers4win64