aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.2824: MS-Windows: build failure with MSVC

Browse Source 
Problem:    MS-Windows: build failure with MSVC.
Solution:   Adjust the list of distributed files.  Add hint about python.
            Adjust path for reading runtime files.
This commit is contained in:
Bram Moolenaar 2021-05-02 19:15:05 +02:00
parent 4c295027a4
commit 1bb0da25a6
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Filelist
View File

@ -437,7 +437,6 @@ SRC_UNIX = \
src/gui_gtk_x11.c \ src/gui_gtk_x11.c \
src/gui_gtk_res.xml \ src/gui_gtk_res.xml \
src/gui_motif.c \ src/gui_motif.c \
src/gui_xim.c \
src/gui_xmdlg.c \ src/gui_xmdlg.c \
src/gui_xmebw.c \ src/gui_xmebw.c \
src/gui_xmebw.h \ src/gui_xmebw.h \
@ -461,7 +460,6 @@ SRC_UNIX = \
src/proto/gui_gtk_x11.pro \ src/proto/gui_gtk_x11.pro \
src/proto/gui_gtk_gresources.pro \ src/proto/gui_gtk_gresources.pro \
src/proto/gui_motif.pro \ src/proto/gui_motif.pro \
src/proto/gui_xim.pro \
src/proto/gui_xmdlg.pro \ src/proto/gui_xmdlg.pro \
src/proto/gui_x11.pro \ src/proto/gui_x11.pro \
src/proto/if_xcmdsrv.pro \ src/proto/if_xcmdsrv.pro \
@ -481,6 +479,7 @@ SRC_UNIX = \
# source files for both DOS and Unix # source files for both DOS and Unix
SRC_DOS_UNIX = \ SRC_DOS_UNIX = \
src/gui_xim.c \
src/if_cscope.c \ src/if_cscope.c \
src/if_cscope.h \ src/if_cscope.h \
src/if_lua.c \ src/if_lua.c \
@ -493,6 +492,7 @@ SRC_DOS_UNIX = \
src/if_py_both.h \ src/if_py_both.h \
src/if_ruby.c \ src/if_ruby.c \
src/if_tcl.c \ src/if_tcl.c \
src/proto/gui_xim.pro \
src/proto/if_cscope.pro \ src/proto/if_cscope.pro \
src/proto/if_lua.pro \ src/proto/if_lua.pro \
src/proto/if_mzsch.pro \ src/proto/if_mzsch.pro \

2
src/testdir/shared.vim
View File

@ -21,6 +21,8 @@ func PythonProg()
let s:python = 'python' let s:python = 'python'
elseif has('win32') elseif has('win32')
" Use Python Launcher for Windows (py.exe) if available. " Use Python Launcher for Windows (py.exe) if available.
" NOTE: if you get a "Python was not found" error, disable the Python
" shortcuts in "Windows menu / Settings / Manage App Execution Aliases".
if executable('py.exe') if executable('py.exe')
let s:python = 'py.exe' let s:python = 'py.exe'
elseif executable('python.exe') elseif executable('python.exe')

14
src/testdir/test_function_lists.vim
View File

@ -55,7 +55,12 @@ func Test_function_lists()
" Verify that the ":help functions" list is complete and in ASCII order. " Verify that the ":help functions" list is complete and in ASCII order.
enew! enew!
read ../../runtime/doc/eval.txt if filereadable('../../doc/eval.txt')
" unpacked MS-Windows zip archive
read ../../doc/eval.txt
else
read ../../runtime/doc/eval.txt
endif
call search('\*functions\*$') call search('\*functions\*$')
call search('^USAGE') call search('^USAGE')
1,.d 1,.d
@ -75,7 +80,12 @@ func Test_function_lists()
" Verify that the ":help function-list" list is complete. " Verify that the ":help function-list" list is complete.
enew! enew!
read ../../runtime/doc/usr_41.txt if filereadable('../../doc/usr_41.txt')
" unpacked MS-Windows zip archive
read ../../doc/usr_41.txt
else
read ../../runtime/doc/usr_41.txt
endif
call search('\*function-list\*$') call search('\*function-list\*$')
1,.d 1,.d
call search('^==*$') call search('^==*$')

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2824,
/**/ /**/
2823, 2823,
/**/ /**/