Fixed appveyor build & libcsptr installation

This commit is contained in:
Snaipe 2015-07-31 00:31:45 +02:00
parent 4553a50f46
commit a58dd92c84
2 changed files with 9 additions and 11 deletions

View file

@ -6,9 +6,9 @@ mkdir dependencies
git clone --branch ${tag} --depth 1 ${repo} dependencies/libcsptr &&
(
cd dependencies/libcsptr &&
./autogen.sh &&
./configure --prefix=$HOME "$@" &&
mkdir build &&
cd $_ &&
cmake -DCMAKE_INSTALL_PREFIX=$HOME "$@" .. &&
make &&
make install
)
rm -Rf dependencies

View file

@ -4,7 +4,6 @@ os: Windows Server 2012
init:
- git config --global core.autocrlf input
- C:\MinGW\bin\mingw-get install mingw32-autotools curl
- 'SET PATH=%PATH%;C:\MinGW\msys\1.0\bin;C:\MinGW\bin'
environment:
@ -23,19 +22,18 @@ configuration: Release
install:
- 'set GCOV_PREFIX=%APPVEYOR_BUILD_FOLDER%'
- 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; .ci/install-libcsptr.sh --host i686-w64-mingw32"'
- 'mkdir build & cd build'
- 'cmake -DCMAKE_PREFIX_PATH=%HOME% -G "MSYS Makefiles" ..'
- 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; .ci/install-libcsptr.sh -G \"MSYS Makefiles\"; true"'
- 'cd dependencies/libcsptr/build && make && make install && cd ../../../'
- 'mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH=%HOME% -G "MSYS Makefiles" ..'
build_script:
- 'mingw32-make'
- 'make'
test_script:
- 'mingw32-make test'
- 'make test'
after_test:
- '%CYG_BASH% -lc "cat $(find $APPVEYOR_BUILD_FOLDER/samples -iname \"*.log\") /dev/null'
- 'mingw32-make coveralls'
- 'make coveralls'
notifications: