Fix Travis-CI build

While here, refactor a bit so that a failing libnfc build does not
indicate a failure of the libfreefare build.
This commit is contained in:
Romain Tartière 2017-06-26 11:15:12 +02:00
parent feb0f15f3e
commit a884eb3dca
2 changed files with 25 additions and 33 deletions

View file

@ -1,33 +1,22 @@
#!/bin/sh
cd $1
build_install()
{
(
cd $1
if [ "$BLD" = autotools ]; then
set -x
autoreconf -vis
mkdir build-autotools
cd build-autotools
../configure --prefix=$HOME/.local
make
make install
set +x
elif [ "$BLD" = cmake ]; then
set -x
mkdir build-cmake
cd build-cmake
cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local ..
make
make install
set +x
else
echo "Unsupported build system: '$BLD'" >&2
exit 1
fi
)
}
git clone https://github.com/nfc-tools/libnfc
build_install libnfc
build_install .
if [ "$BLD" = autotools ]; then
set -x
autoreconf -vis
mkdir build-autotools
cd build-autotools
../configure --prefix=$HOME/.local
make
make install
elif [ "$BLD" = cmake ]; then
set -x
mkdir build-cmake
cd build-cmake
cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local ..
make
make install
else
echo "Unsupported build system: '$BLD'" >&2
exit 1
fi