don't build x64 build on msvc-10, since appveyor doesn't seem to have that toolst installed

This commit is contained in:
arvidn 2015-08-23 17:33:41 +02:00 committed by arvidn
parent 2854e340ab
commit 9914854228
1 changed files with 19 additions and 12 deletions

View File

@ -8,6 +8,8 @@ environment:
matrix: matrix:
- variant: test_debug - variant: test_debug
compiler: msvc-12.0 compiler: msvc-12.0
x64: 1
sim: 1
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"' linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"' linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"' include: '"c:\\openssl-1.0.1p-vs2013\\include"'
@ -23,11 +25,13 @@ environment:
include: '"c:\\openssl-1.0.1p-vs2013\\include"' include: '"c:\\openssl-1.0.1p-vs2013\\include"'
- variant: test_barebones - variant: test_barebones
compiler: msvc-12.0 compiler: msvc-12.0
x64: 1
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"' linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"' linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"' include: '"c:\\openssl-1.0.1p-vs2013\\include"'
- variant: test_release - variant: test_release
compiler: msvc-12.0 compiler: msvc-12.0
x64: 1
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"' linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"' linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"' include: '"c:\\openssl-1.0.1p-vs2013\\include"'
@ -77,16 +81,19 @@ cache:
- C:\openssl-1.0.1p-vs2013 - C:\openssl-1.0.1p-vs2013
- C:\openssl-1.0.1p-vs2010 - C:\openssl-1.0.1p-vs2010
build_script: build_script:
- type "C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\vcvarsall.bat" x86_amd64 - cd %ROOT_DIRECTORY%\examples
#- cd %ROOT_DIRECTORY%\examples - b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags32% include=%include%
#- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags32% include=%include% - cd %ROOT_DIRECTORY%\test
#- cd %ROOT_DIRECTORY%\test - b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags32% include=%include%
#- b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags32% include=%include% - if defined x64 (
#- b2.exe --hash -j2 address-model=64 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags64% include=%include% b2.exe --hash -j2 address-model=64 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags64% include=%include%
#- cd %ROOT_DIRECTORY%\bindings\python )
#- b2.exe --hash -j2 %compiler% stage_module variant=%variant% linkflags=%linkflags32% include=%include% - cd %ROOT_DIRECTORY%\bindings\python
#- python test.py - b2.exe --hash -j2 %compiler% stage_module variant=%variant% linkflags=%linkflags32% include=%include%
#- if %variant% == "test_debug" ( - python test.py
# cd %ROOT_DIRECTORY%\simulation - if defined sim (
# && b2.exe --hash -j2 crypto=built-in %compiler% ) cd %ROOT_DIRECTORY%\simulation
&& b2.exe --hash -j2 crypto=built-in %compiler%
)