annotate ci/appveyor.bat @ 26650:a07323eb647f v8.2.3854

patch 8.2.3854: Vim9: inconsistent arguments for test functions Commit: https://github.com/vim/vim/commit/86b3ab4fa0de3e8884ab6a6ced2a70592b937d0f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Dec 19 18:33:23 2021 +0000 patch 8.2.3854: Vim9: inconsistent arguments for test functions Problem: Vim9: inconsistent arguments for test functions. Solution: When :def function and script have different arguments use a list with two items instead of a separate function.
author Bram Moolenaar <Bram@vim.org>
date Sun, 19 Dec 2021 19:45:03 +0100
parents 8a3659f78064
children 83bd6e25d0b6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8242
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
1 @echo off
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
2 :: Batch file for building/testing Vim on AppVeyor
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
3
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
4 setlocal ENABLEDELAYEDEXPANSION
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
5 cd %APPVEYOR_BUILD_FOLDER%
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
6
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
7 cd src
17405
8292b2dde464 patch 8.1.1701: Appveyor build with MSVC fails puts progress bar in log
Bram Moolenaar <Bram@vim.org>
parents: 17399
diff changeset
8 :: Filter out the progress bar from the build log
8292b2dde464 patch 8.1.1701: Appveyor build with MSVC fails puts progress bar in log
Bram Moolenaar <Bram@vim.org>
parents: 17399
diff changeset
9 sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
8292b2dde464 patch 8.1.1701: Appveyor build with MSVC fails puts progress bar in log
Bram Moolenaar <Bram@vim.org>
parents: 17399
diff changeset
10
8242
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
11 echo "Building MSVC 64bit console Version"
21534
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
12 nmake -f Make_mvc2.mak CPU=AMD64 ^
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
13 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
24721
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
14 FEATURES=%FEATURE%
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
15 if not exist vim.exe (
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
16 echo Build failure.
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
17 exit 1
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
18 )
8242
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
19
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
20 :: build MSVC huge version with python and channel support
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
21 :: GUI needs to be last, so that testing works
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
22 echo "Building MSVC 64bit GUI Version"
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
23 if "%FEATURE%" == "HUGE" (
21534
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
24 nmake -f Make_mvc2.mak CPU=AMD64 ^
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
25 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
26 PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
27 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
24721
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
28 FEATURES=%FEATURE%
8242
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
29 ) ELSE (
21534
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
30 nmake -f Make_mvc2.mak CPU=AMD64 ^
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
31 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
24721
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
32 FEATURES=%FEATURE%
8242
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
33 )
24721
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
34 if not exist gvim.exe (
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
35 echo Build failure.
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
36 exit 1
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
37 )
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
38 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt || exit 1
8242
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
39
21534
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
40 echo "version output MSVC console"
24721
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
41 .\vim --version || exit 1
21534
69a59cc69519 patch 8.2.1317: MS-Windows tests on AppVeyor are slow
Bram Moolenaar <Bram@vim.org>
parents: 20931
diff changeset
42 echo "version output MSVC GUI"
24721
8a3659f78064 patch 8.2.2899: Appveyor script does not detect nmake failure
Bram Moolenaar <Bram@vim.org>
parents: 21534
diff changeset
43 type ver_msvc.txt || exit 1
8242
1313d2e282dc commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
44 cd ..