mirror of
https://github.com/vim/vim
synced 2025-07-16 01:01:58 +00:00
patch 9.0.1177: AppVeyor uses some older tools
Problem: AppVeyor uses some older tools. Solution: Switch to Visual Studio 2022 and Python 3.11. (Christopher Plewright, closes #11793)
This commit is contained in:
committed by
Bram Moolenaar
parent
f68cddabff
commit
ad15a39fdb
@ -1,6 +1,6 @@
|
|||||||
version: "{build}"
|
version: "{build}"
|
||||||
|
|
||||||
image: Visual Studio 2015
|
image: Visual Studio 2022
|
||||||
|
|
||||||
skip_tags: true
|
skip_tags: true
|
||||||
|
|
||||||
@ -16,8 +16,21 @@ matrix:
|
|||||||
fast_finish: true
|
fast_finish: true
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
# Use Visual Studio 2015 compiler tools (default is 2012)
|
# Use latest compiler tools (Visual Studio 2022)
|
||||||
- '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64'
|
- setlocal ENABLEDELAYEDEXPANSION
|
||||||
|
- call ver
|
||||||
|
- set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
|
||||||
|
- >
|
||||||
|
if exist "%VSWHERE%" (
|
||||||
|
for /f "usebackq delims=" %%i
|
||||||
|
in (`"%VSWHERE%" -products * -latest -property installationPath`)
|
||||||
|
do (set "VCVARSALL=%%i\VC\Auxiliary\Build\vcvarsall.bat")
|
||||||
|
)
|
||||||
|
- >
|
||||||
|
if not exist "%VCVARSALL%" (
|
||||||
|
set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
|
||||||
|
)
|
||||||
|
- call "%VCVARSALL%" x64
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- ci/appveyor.bat
|
- ci/appveyor.bat
|
||||||
@ -25,7 +38,7 @@ build_script:
|
|||||||
test_script:
|
test_script:
|
||||||
- cd src/testdir
|
- cd src/testdir
|
||||||
# Testing with MSVC gvim
|
# Testing with MSVC gvim
|
||||||
- path C:\Python35-x64;%PATH%
|
- path C:\Python311-x64;%PATH%
|
||||||
- nmake -f Make_mvc.mak VIMPROG=..\gvim
|
- nmake -f Make_mvc.mak VIMPROG=..\gvim
|
||||||
- nmake -f Make_mvc.mak clean
|
- nmake -f Make_mvc.mak clean
|
||||||
# Testing with MSVC console version
|
# Testing with MSVC console version
|
||||||
|
@ -22,7 +22,7 @@ if "%FEATURE%" == "HUGE" (
|
|||||||
nmake -f Make_mvc.mak CPU=AMD64 ^
|
nmake -f Make_mvc.mak CPU=AMD64 ^
|
||||||
OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
|
OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
|
||||||
PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
|
PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
|
||||||
PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
|
PYTHON3_VER=311 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python311-x64 ^
|
||||||
FEATURES=%FEATURE%
|
FEATURES=%FEATURE%
|
||||||
) ELSE (
|
) ELSE (
|
||||||
nmake -f Make_mvc.mak CPU=AMD64 ^
|
nmake -f Make_mvc.mak CPU=AMD64 ^
|
||||||
|
@ -695,6 +695,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1177,
|
||||||
/**/
|
/**/
|
||||||
1176,
|
1176,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user