Patch 9.0.1206
Problem: Testing with Python on AppVeyor does not work properly.
Solution: Fix typo. Move most lines to the .bat file. (Christopher
Plewright, closes #11828)
Files: .appveyor.yml, ci/appveyor.bat
*** ../vim-9.0.1205/.appveyor.yml 2023-01-13 15:28:07.667489184 +0000
--- .appveyor.yml 2023-01-16 13:00:42.645675256 +0000
***************
*** 35,68 ****
fast_finish: true
before_build:
- # - systeminfo
- # - wmic /NameSpace:\\root\Microsoft\Windows\Storage Path MSFT_PhysicalDisk
get FriendlyName,Model,AllocatedSize,UniqueId
- - 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
test_script:
! - cd src/testdir
! # Testing with MSVC gvim
! - path C:\Python38-x64;%PATH%
! - nmake -f Make_mvc.mak VIMPROG=..\gvim
! - nmake -f Make_mvc.mak clean
! # Testing with MSVC console version
! - nmake -f Make_mvc.mak VIMPROG=..\vim
artifacts:
- path: src/vim.exe
--- 35,48 ----
fast_finish: true
before_build:
- call ver
! - ci\appveyor.bat install
build_script:
! - ci\appveyor.bat build
test_script:
! - ci\appveyor.bat test
artifacts:
- path: src/vim.exe
*** ../vim-9.0.1205/ci/appveyor.bat 2023-01-15 13:23:16.422166107 +0000
--- ci/appveyor.bat 2023-01-16 12:57:01.325900210 +0000
***************
*** 1,5 ****
--- 1,6 ----
@echo off
:: Batch file for building/testing Vim on AppVeyor
+ set target=%1
setlocal ENABLEDELAYEDEXPANSION
cd %APPVEYOR_BUILD_FOLDER%
***************
*** 10,22 ****
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
--- 11,53 ----
set
PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe
set PYTHON3_DIR=C:\python%PYTHON3_VER%-x64
+ 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
+
+ goto %target%
+ echo Unknown build target.
+ exit 1
+
+ ::
----------------------------------------------------------------------------
+ :install
+ @echo on
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
)
+ @echo off
+ goto :eof
+
+ ::
----------------------------------------------------------------------------
+ :build
cd src
***************
*** 53,63 ****
.\vim --version || exit 1
echo "version output MSVC GUI"
type ver_msvc.txt || exit 1
- cd ..
goto :eof
- :: ----------------------------------------------------------------------
:downloadfile
:: call :downloadfile <URL> <localfile>
if not exist %2 (
--- 84,107 ----
.\vim --version || exit 1
echo "version output MSVC GUI"
type ver_msvc.txt || exit 1
goto :eof
+ ::
----------------------------------------------------------------------------
+ :test
+ @echo on
+ cd src/testdir
+ :: Testing with MSVC gvim
+ path %PYTHON3_DIR%;%PATH%
+ nmake -f Make_mvc.mak VIMPROG=..\gvim
+ nmake -f Make_mvc.mak clean
+ :: Testing with MSVC console version
+ nmake -f Make_mvc.mak VIMPROG=..\vim
+
+ @echo off
+ goto :eof
+
+ ::
----------------------------------------------------------------------------
:downloadfile
:: call :downloadfile <URL> <localfile>
if not exist %2 (
*** ../vim-9.0.1205/src/version.c 2023-01-15 20:48:56.751583003 +0000
--- src/version.c 2023-01-16 13:00:54.181663573 +0000
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1206,
/**/
--
Computers are useless. They can only give you answers.
-- Pablo Picasso
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20230116130159.C71591C099F%40moolenaar.net.
