From 2e3876b287de9ee69c839d1744156f0ebd56af65 Mon Sep 17 00:00:00 2001 From: arvidn Date: Sun, 20 Sep 2015 14:56:00 -0400 Subject: [PATCH] just disable msvc-14 for now --- appveyor.yml | 16 +++++++++------- appveyor/user-config.jam | 4 ---- 2 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 appveyor/user-config.jam diff --git a/appveyor.yml b/appveyor.yml index 0b417a52e..644ba5ae9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,15 +2,15 @@ version: 1.0.{build} branches: only: - master -os: Previous Visual Studio 2015 +os: Visual Studio 2015 clone_depth: 1 environment: matrix: - - variant: test_debug - compiler: msvc-14.0 - sim: 1 - linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"' - include: '"c:\\openssl-1.0.1p-vs2015\\include"' +# - variant: test_debug +# compiler: msvc-14.0 +# sim: 1 +# linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"' +# include: '"c:\\openssl-1.0.1p-vs2015\\include"' - variant: test_debug compiler: msvc-12.0 x64: 1 @@ -18,6 +18,7 @@ environment: include: '"c:\\openssl-1.0.1p-vs2013\\include"' - variant: test_debug compiler: msvc-12.0 + sim: 1 linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"' include: '"c:\\openssl-1.0.1p-vs2013\\include"' - variant: test_debug @@ -92,7 +93,8 @@ install: - echo %BOOST_ROOT% - echo %BOOST_BUILD_PATH% - set PATH=%PATH%;%BOOST_BUILD_PATH%\src\engine\bin.ntx86 -- copy appveyor\user-config.jam %HOMEDRIVE%%HOMEPATH% +- 'echo using msvc : 10.0 ; >%HOMEDRIVE%%HOMEPATH%/user-config.jam' +- 'echo using msvc : 12.0 ; >>%HOMEDRIVE%%HOMEPATH%/user-config.jam' - type %HOMEDRIVE%%HOMEPATH%\user-config.jam - cd %ROOT_DIRECTORY% - set PATH=%PATH%;c:\Mingw\bin diff --git a/appveyor/user-config.jam b/appveyor/user-config.jam deleted file mode 100644 index eb06d1180..000000000 --- a/appveyor/user-config.jam +++ /dev/null @@ -1,4 +0,0 @@ -using msvc : 10.0 ; -using msvc : 12.0 ; -using msvc : 14.0 : : "C:\Program Files (x86)\Windows Kits\10\Include\10.0.10069.0\ucrt" ; -using gcc ;