try travis for osx
This commit is contained in:
+6
-5
@@ -1,4 +1,7 @@
|
|||||||
language: c
|
language: c
|
||||||
|
os:
|
||||||
|
- osx
|
||||||
|
- linux
|
||||||
compiler:
|
compiler:
|
||||||
- gcc
|
- gcc
|
||||||
- clang
|
- clang
|
||||||
@@ -6,16 +9,14 @@ env:
|
|||||||
- EXTRA=libpcsclite-dev
|
- EXTRA=libpcsclite-dev
|
||||||
script:
|
script:
|
||||||
- ./build-and-test.sh
|
- ./build-and-test.sh
|
||||||
before_install:
|
|
||||||
- sudo apt-get update -qq
|
|
||||||
- sudo apt-get remove -qq -y $REMOVE
|
|
||||||
- sudo apt-get autoremove -qq
|
|
||||||
- sudo apt-get install -qq -y gengetopt help2man $EXTRA
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- compiler: gcc
|
- compiler: gcc
|
||||||
|
os: linux
|
||||||
env: EXTRA="wine mingw-w64 mingw-w64-dev" REMOVE=mingw32 ARCH=32
|
env: EXTRA="wine mingw-w64 mingw-w64-dev" REMOVE=mingw32 ARCH=32
|
||||||
- compiler: gcc
|
- compiler: gcc
|
||||||
|
os: linux
|
||||||
env: EXTRA="wine mingw-w64 mingw-w64-dev" REMOVE=mingw32 ARCH=64
|
env: EXTRA="wine mingw-w64 mingw-w64-dev" REMOVE=mingw32 ARCH=64
|
||||||
- compiler: gcc
|
- compiler: gcc
|
||||||
|
os: linux
|
||||||
env: COVERAGE="--enable-coverage" EXTRA="libpcsclite-dev lcov"
|
env: COVERAGE="--enable-coverage" EXTRA="libpcsclite-dev lcov"
|
||||||
|
|||||||
+20
-2
@@ -4,13 +4,31 @@ set -e
|
|||||||
|
|
||||||
autoreconf -i
|
autoreconf -i
|
||||||
|
|
||||||
|
if [ "x$TRAVIS_OS_NAME" != "xosx" ]; then
|
||||||
|
sudo apt-get update -qq
|
||||||
|
sudo apt-get remove -qq -y $REMOVE
|
||||||
|
sudo apt-get autoremove -qq
|
||||||
|
sudo apt-get install -qq -y gengetopt help2man $EXTRA
|
||||||
|
TAR=tar
|
||||||
|
else
|
||||||
|
ARCH=osx
|
||||||
|
brew update
|
||||||
|
brew install help2man
|
||||||
|
brew install pkg-config
|
||||||
|
brew install gengetopt
|
||||||
|
brew install gnu-tar
|
||||||
|
TAR=gtar
|
||||||
|
fi
|
||||||
if [ "x$ARCH" != "x" ]; then
|
if [ "x$ARCH" != "x" ]; then
|
||||||
version=`cat NEWS | grep unreleased | cut -d' ' -f3`
|
version=`cat NEWS | grep unreleased | cut -d' ' -f3`
|
||||||
set +e
|
set +e
|
||||||
tar --exclude .git --transform="s/^\./yubico-piv-tool-${version}/" -czf yubico-piv-tool-${version}.tar.gz .
|
$TAR --exclude .git --transform="s/^\./yubico-piv-tool-${version}/" -czf yubico-piv-tool-${version}.tar.gz .
|
||||||
set -e
|
set -e
|
||||||
|
if [ "x$ARCH" != "xosx" ]; then
|
||||||
make -f windows.mk ${ARCH}bit VERSION=$version
|
make -f windows.mk ${ARCH}bit VERSION=$version
|
||||||
|
else
|
||||||
|
make -f mac.mk mac VERSION=$version
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
./configure $COVERAGE
|
./configure $COVERAGE
|
||||||
make check
|
make check
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ doit:
|
|||||||
tar xfz $(PACKAGE)-$(VERSION).tar.gz && \
|
tar xfz $(PACKAGE)-$(VERSION).tar.gz && \
|
||||||
cd $(PACKAGE)-$(VERSION)/ && \
|
cd $(PACKAGE)-$(VERSION)/ && \
|
||||||
PKG_CONFIG_PATH=$(PWD)/tmp/root/lib/pkgconfig ./configure --prefix=$(PWD)/tmp/root && \
|
PKG_CONFIG_PATH=$(PWD)/tmp/root/lib/pkgconfig ./configure --prefix=$(PWD)/tmp/root && \
|
||||||
make install check && \
|
make install $(CHECK) && \
|
||||||
chmod u+w $(PWD)/tmp/root/lib/libcrypto.1.0.0.dylib && \
|
chmod u+w $(PWD)/tmp/root/lib/libcrypto.1.0.0.dylib && \
|
||||||
install_name_tool -id @executable_path/../lib/libcrypto.1.0.0.dylib $(PWD)/tmp/root/lib/libcrypto.1.0.0.dylib && \
|
install_name_tool -id @executable_path/../lib/libcrypto.1.0.0.dylib $(PWD)/tmp/root/lib/libcrypto.1.0.0.dylib && \
|
||||||
install_name_tool -id @executable_path/../lib/libykpiv.1.dylib $(PWD)/tmp/root/lib/libykpiv.1.dylib && \
|
install_name_tool -id @executable_path/../lib/libykpiv.1.dylib $(PWD)/tmp/root/lib/libykpiv.1.dylib && \
|
||||||
|
|||||||
Reference in New Issue
Block a user