diff options
author | Christopher Plewright <chris@createng.com> | 2023-01-11 12:49:22 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2023-01-11 12:49:22 +0000 |
commit | ad15a39fdbde5ef8d4af9e0fca7e7e53b4843270 (patch) | |
tree | cf160eaa6c41d0ea151d48042e04fee0cadf38d1 | |
parent | f68cddabffcbc5b8fbfe9003182cb4b55ff8d72c (diff) | |
download | vim-git-ad15a39fdbde5ef8d4af9e0fca7e7e53b4843270.tar.gz |
patch 9.0.1177: AppVeyor uses some older toolsv9.0.1177
Problem: AppVeyor uses some older tools.
Solution: Switch to Visual Studio 2022 and Python 3.11. (Christopher
Plewright, closes #11793)
-rw-r--r-- | .appveyor.yml | 21 | ||||
-rw-r--r-- | ci/appveyor.bat | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 20 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index c87857e4a..57f5bee3b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,6 @@ version: "{build}" -image: Visual Studio 2015 +image: Visual Studio 2022 skip_tags: true @@ -16,8 +16,21 @@ matrix: fast_finish: true before_build: - # Use Visual Studio 2015 compiler tools (default is 2012) - - '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64' + # Use latest compiler tools (Visual Studio 2022) + - 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: - ci/appveyor.bat @@ -25,7 +38,7 @@ build_script: test_script: - cd src/testdir # 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 clean # Testing with MSVC console version diff --git a/ci/appveyor.bat b/ci/appveyor.bat index 92ec936f9..b780ff1f0 100644 --- a/ci/appveyor.bat +++ b/ci/appveyor.bat @@ -22,7 +22,7 @@ if "%FEATURE%" == "HUGE" ( nmake -f Make_mvc.mak CPU=AMD64 ^ OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^ 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% ) ELSE ( nmake -f Make_mvc.mak CPU=AMD64 ^ diff --git a/src/version.c b/src/version.c index 6a5f62da9..2565fcdca 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1177, +/**/ 1176, /**/ 1175, |