From 58df02e97fb823bb861d149674155bb46ecbae80 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Sun, 12 Mar 2017 14:59:01 +0000 Subject: [PATCH] ci|mscompile: Remove VS2013 configurations VS2017 hasn't been added to mscompile since a VC150COMNTOOLS environment variable isn't set when VS2017 is installed. --- appveyor.yml | 4 ---- mscompile.cmd | 10 ++++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 32d72a42d3..13c0e4edae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,10 +8,6 @@ environment: - platform: Win32 target: AppVeyor visualstudio_string: vs2015 - - platform: Win32 - VisualStudioVersion: 12.0 - target: AppVeyor - visualstudio_string: vs2013 matrix: fast_finish: true diff --git a/mscompile.cmd b/mscompile.cmd index ec5d4f2967..204cb13a2d 100644 --- a/mscompile.cmd +++ b/mscompile.cmd @@ -15,13 +15,11 @@ REM If not, see . CLS ECHO Select your Visual Studio version: -ECHO 1. Microsoft Visual Studio 2013 (default) -ECHO 2. Microsoft Visual Studio 2015 +ECHO 1. Microsoft Visual Studio 2015 ECHO Q. Exit the script. -CHOICE /C 12Q /T 10 /D 1 /M "Visual Studio version: " -IF ERRORLEVEL 3 GOTO END -IF ERRORLEVEL 2 SET "VCVARPATH=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" -IF ERRORLEVEL 1 SET "VCVARPATH=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" +CHOICE /C 1Q /T 10 /D 1 /M "Visual Studio version: " +IF ERRORLEVEL 2 GOTO END +IF ERRORLEVEL 1 SET "VCVARPATH=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" ECHO. ECHO Select the desired configuration: