To: vim_dev@googlegroups.com Subject: Patch 9.0.1200 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1200 Problem: AppVeyor builds with an old Python version. Solution: Switch from Python 3.8 to 3.11. (Christopher Plewright, closes #11814) Files: ci/appveyor.bat *** ../vim-9.0.1199/ci/appveyor.bat 2023-01-13 15:28:07.667489184 +0000 --- ci/appveyor.bat 2023-01-15 13:21:36.798230599 +0000 *************** *** 4,9 **** --- 4,23 ---- setlocal ENABLEDELAYEDEXPANSION cd %APPVEYOR_BUILD_FOLDER% + :: Python3 + set PYTHON3_VER=311 + set PYTHON3_RELEASE=3.11.1 + set PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe + set PYTHON3_DIR=C:\python%PYTHON3_VER%-x64 + + if not exist downloads mkdir downloads + + :: Python 3 + if not exist %PYTHON3_DIR% ( + call :downloadfile %PYTHON3_URL% downloads\python3.exe + cmd /c start /wait downloads\python3.exe /quiet TargetDir=%PYTHON3_DIR% Include_pip=0 Include_tcltk=0 Include_test=0 Include_tools=0 AssociateFiles=0 Shortcuts=0 Include_doc=0 Include_launcher=0 InstallLauncherAllUsers=0 + ) + cd src echo "Building MSVC 64bit console Version" *************** *** 22,28 **** 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=38 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python38-x64 ^ FEATURES=%FEATURE% ) ELSE ( nmake -f Make_mvc.mak CPU=AMD64 ^ --- 36,42 ---- 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=%PYTHON3_VER% DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^ FEATURES=%FEATURE% ) ELSE ( nmake -f Make_mvc.mak CPU=AMD64 ^ *************** *** 40,42 **** --- 54,70 ---- echo "version output MSVC GUI" type ver_msvc.txt || exit 1 cd .. + + goto :eof + :: ---------------------------------------------------------------------- + + :downloadfile + :: call :downloadfile + if not exist %2 ( + curl -f -L %1 -o %2 + ) + if ERRORLEVEL 1 ( + rem Retry once. + curl -f -L %1 -o %2 || exit 1 + ) + @goto :eof *** ../vim-9.0.1199/src/version.c 2023-01-14 21:07:03.998952303 +0000 --- src/version.c 2023-01-15 13:23:01.178176182 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1200, /**/ -- hundred-and-one symptoms of being an internet addict: 12. You turn off your Wifi and get this awful empty feeling, like you just pulled the plug on a loved one. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///