]> granicus.if.org Git - vim/commitdiff
patch 9.0.1177: AppVeyor uses some older tools v9.0.1177
authorChristopher Plewright <chris@createng.com>
Wed, 11 Jan 2023 12:49:22 +0000 (12:49 +0000)
committerBram Moolenaar <Bram@vim.org>
Wed, 11 Jan 2023 12:49:22 +0000 (12:49 +0000)
Problem:    AppVeyor uses some older tools.
Solution:   Switch to Visual Studio 2022 and Python 3.11. (Christopher
            Plewright, closes #11793)

.appveyor.yml
ci/appveyor.bat
src/version.c

index c87857e4a8b89ee2af1d677dfb79798876a44e77..57f5bee3ba9bf4d0372a7b006771b333a6d6cd08 100644 (file)
@@ -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
index 92ec936f98eceb642ee28190ed461bd9287ddde7..b780ff1f071fc900abcc239e0b0994414d205948 100644 (file)
@@ -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 ^
index 6a5f62da9e2cd184495aa23e1899a3224728b78c..2565fcdca8e804b9b883920e55296c32526d0640 100644 (file)
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1177,
 /**/
     1176,
 /**/