Mercurial > vim
annotate ci/appveyor.bat @ 21459:a422bd80b434 v8.2.1280
patch 8.2.1280: Ex command error cannot contain an argument
Commit: https://github.com/vim/vim/commit/8930caaa1a283092aca81fdbc3fcf15c7eadb197
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jul 23 16:37:03 2020 +0200
patch 8.2.1280: Ex command error cannot contain an argument
Problem: Ex command error cannot contain an argument.
Solution: Add ex_errmsg() and translate earlier. Use e_trailing_arg where
possible.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 23 Jul 2020 16:45:03 +0200 |
parents | 2351948e193d |
children | 69a59cc69519 |
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 |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
8 echo "Building MinGW 32bit console version" |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
9 set PATH=c:\msys64\mingw32\bin;%PATH% |
15607
2dcaa860e3fc
patch 8.1.0811: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
10080
diff
changeset
|
10 mingw32-make.exe -f Make_ming.mak GUI=no OPTIMIZE=speed IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 |
20931
2351948e193d
patch 8.2.1017: Appveyor output doesn't show MinGW console features
Bram Moolenaar <Bram@vim.org>
parents:
17405
diff
changeset
|
11 .\vim -u NONE -c "redir @a | ver |0put a | wq" ver_ming.txt |
8242
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
12 :: Save vim.exe before Make clean, moved back below. |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
13 copy vim.exe testdir |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
14 mingw32-make.exe -f Make_ming.mak clean |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
15 |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
16 :: Build Mingw huge version with python and channel support, or |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
17 :: with specified features without python. |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
18 echo "Building MinGW 32bit GUI version" |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
19 if "%FEATURE%" == "HUGE" ( |
15607
2dcaa860e3fc
patch 8.1.0811: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
10080
diff
changeset
|
20 mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed CHANNEL=yes GUI=yes IME=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35 FEATURES=%FEATURE% || exit 1 |
8242
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
21 ) ELSE ( |
15607
2dcaa860e3fc
patch 8.1.0811: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
10080
diff
changeset
|
22 mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 |
8242
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
23 ) |
20931
2351948e193d
patch 8.2.1017: Appveyor output doesn't show MinGW console features
Bram Moolenaar <Bram@vim.org>
parents:
17405
diff
changeset
|
24 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_ming_gui.txt |
8242
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
25 |
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
|
26 :: 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
|
27 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
|
28 |
8242
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
29 echo "Building MSVC 64bit console Version" |
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
|
30 nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 |
20931
2351948e193d
patch 8.2.1017: Appveyor output doesn't show MinGW console features
Bram Moolenaar <Bram@vim.org>
parents:
17405
diff
changeset
|
31 :: The executable is not used |
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
|
32 nmake -f Make_mvc2.mak clean |
8242
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
33 |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
34 :: 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
|
35 :: 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
|
36 echo "Building MSVC 64bit GUI Version" |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
37 if "%FEATURE%" == "HUGE" ( |
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
|
38 nmake -f Make_mvc2.mak DIRECTX=yes CPU=AMD64 CHANNEL=yes OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 FEATURES=%FEATURE% || exit 1 |
8242
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
39 ) ELSE ( |
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
|
40 nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 |
8242
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
41 ) |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
42 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
43 |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
44 :: Restore vim.exe, tests will run with this. |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
45 move /Y testdir\vim.exe . |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
46 echo "version output MinGW" |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
47 type ver_ming.txt |
20931
2351948e193d
patch 8.2.1017: Appveyor output doesn't show MinGW console features
Bram Moolenaar <Bram@vim.org>
parents:
17405
diff
changeset
|
48 echo "version output MinGW GUI" |
2351948e193d
patch 8.2.1017: Appveyor output doesn't show MinGW console features
Bram Moolenaar <Bram@vim.org>
parents:
17405
diff
changeset
|
49 type ver_ming_gui.txt |
8242
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
50 echo "version output MVC" |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
51 type ver_msvc.txt |
1313d2e282dc
commit https://github.com/vim/vim/commit/81275ca9ce3059148fdb65dff29f7ecdbca446fb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
52 cd .. |