Mercurial > vim

changeset 31690:52232e3ff22f v9.0.1177

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1177: AppVeyor uses some older tools Commit: https://github.com/vim/vim/commit/ad15a39fdbde5ef8d4af9e0fca7e7e53b4843270 Author: Christopher Plewright <chris@createng.com> Date: Wed Jan 11 12:49:22 2023 +0000 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)
author Bram Moolenaar <Bram@vim.org>
date Wed, 11 Jan 2023 14:00:06 +0100
parents bdba967e3aac
children db1f32c41199
files .appveyor.yml ci/appveyor.bat src/version.c
diffstat 3 files changed, 20 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 ^
--- 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,