premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

enable just 64 bit builds (appveyor). fetch both 32 and 64 bit build of openssl. always overwrite in 7z command

This commit is contained in:
arvidn 2015-08-20 22:33:20 +02:00 committed by arvidn
parent 686896bd38
commit 1e4cbbc65c
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
appveyor.yml
View File

@ -8,19 +8,24 @@ environment:
matrix:
- variant: test_debug
compiler: msvc-12.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
- variant: test_debug
compiler: msvc-10.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
- variant: test_debug
compiler: msvc-14.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
- variant: test_barebones
compiler: msvc-12.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
- variant: test_release
compiler: msvc-12.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
# mingw and boost.random don't like each other. Comment this back in once there
# is support
@ -33,11 +38,13 @@ install:
- git submodule update --init --recursive
- set ROOT_DIRECTORY=%CD%
- cd %ROOT_DIRECTORY%
- if not exist c:\OpenSSL-Win32\nul (
appveyor DownloadFile https://strcpy.net/packages/Win32OpenSSL-1_0_2a.exe
&& Win32OpenSSL-1_0_2a.exe /silent /verysilent /sp- /suppressmsgboxes )
- copy c:\OpenSSL-Win32\ssleay32.dll %WINDIR%\system32
- copy c:\OpenSSL-Win32\libeay32.dll %WINDIR%\system32
- if not exist c:\openssl-1.0.1p-vs2013\nul (
appveyor DownloadFile http://www.npcglib.org/~stathis/downloads/openssl-1.0.1p-vs2013.7z
&& 7z x -oc:\ -aoa openssl-1.0.1p-vs2013.7z
&& copy c:\openssl-1.0.1p-vs2013\lib64\ssleay32MT.lib c:\openssl-1.0.1p-vs2013\lib64\ssleay32.lib
&& copy c:\openssl-1.0.1p-vs2013\lib64\libeay32MT.lib c:\openssl-1.0.1p-vs2013\lib64\libeay32.lib
&& copy c:\openssl-1.0.1p-vs2013\lib\ssleay32MT.lib c:\openssl-1.0.1p-vs2013\lib\ssleay32.lib
&& copy c:\openssl-1.0.1p-vs2013\lib\libeay32MT.lib c:\openssl-1.0.1p-vs2013\lib\libeay32.lib )
- cd %ROOT_DIRECTORY%
- set BOOST_ROOT=c:\Libraries\boost
- set BOOST_BUILD_PATH=%BOOST_ROOT%\tools\build
@ -55,14 +62,15 @@ install:
- python --version
- echo %ROOT_DIRECTORY%
cache:
- C:\OpenSSL-Win32
- C:\openssl-1.0.1p-vs2013
build_script:
- cd %ROOT_DIRECTORY%\examples
- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include"
- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags32% include="c:\\openssl-1.0.1p-vs2013\\include"
- cd %ROOT_DIRECTORY%\test
- b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include"
- b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags32% include="c:\\openssl-1.0.1p-vs2013\\include"
- b2.exe --hash -j2 address-model=64 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags64% include="c:\\openssl-1.0.1p-vs2013\\include"
- cd %ROOT_DIRECTORY%\bindings\python
- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" stage_module
- b2.exe --hash -j2 %compiler% stage_module variant=%variant% linkflags=%linkflags32% include="c:\\openssl-1.0.1p-vs2013\\include"
- python test.py
- if %variant% == "test_debug" (
cd %ROOT_DIRECTORY%\simulation