thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 7.4.2288

Browse Source 
Problem:    MS-Windows build instructions are clumsy. "dosbin" doesn't build.
Solution:   Add rename.bat. Fix building "dosbin".
This commit is contained in:
Bram Moolenaar 2016-08-28 20:14:38 +02:00
parent 6fc8227ebf
commit cb03397aba
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Filelist
View File

@ -316,6 +316,7 @@ SRC_DOS = \
src/Make_dvc.mak \ src/Make_dvc.mak \
src/Make_ming.mak \ src/Make_ming.mak \
src/Make_mvc.mak \ src/Make_mvc.mak \
tools/rename.bat \
src/bigvim.bat \ src/bigvim.bat \
src/bigvim64.bat \ src/bigvim64.bat \
src/msvcsetup.bat \ src/msvcsetup.bat \

18
Makefile
View File

@ -137,19 +137,21 @@ MINOR = 4
# - > cd src # - > cd src
# > nmake -f Make_mvc.mak # > nmake -f Make_mvc.mak
# - Run the tests: # - Run the tests:
# > rm testdir/*.out testdir/*.res # > nmake -f Make_mvc.mak testclean
# > nmake -f Make_mvc.mak test # > nmake -f Make_mvc.mak test
# - check the output. # - check the output.
# - Rename: vim.exe to vimw32.exe, # - Rename (using tools/rename.bat):
# tee/tee.exe to teew32.exe, # vim.exe to vimw32.exe
# tee/tee.exe to teew32.exe
# xxd/xxd.exe to xxdw32.exe # xxd/xxd.exe to xxdw32.exe
# - Rename vim.pdb to vimw32.pdb. # vim.pdb to vimw32.pdb
# - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe. # install.exe to installw32.exe
# uninstal.exe to uninstalw32.exe
# Win32 GUI version build: # Win32 GUI version build:
# - > cd src # - > cd src
# > nmake -f Make_mvc.mak GUI=yes # > nmake -f Make_mvc.mak GUI=yes
# - Run the tests: # - Run the tests:
# > rm testdir/*.out testdir/*.res # > nmake -f Make_mvc.mak testclean
# > nmake -f Make_mvc.mak testgvim # > nmake -f Make_mvc.mak testgvim
# - check the output. # - check the output.
# - move "gvim.exe" to here (otherwise the OLE version will overwrite it). # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
@ -163,7 +165,7 @@ MINOR = 4
# Adjust bigvim.bat to match the version of each interface you want. # Adjust bigvim.bat to match the version of each interface you want.
# > bigvim.bat # > bigvim.bat
# - Run the tests: # - Run the tests:
# > rm testdir/*.out testdir/*.res # > nmake -f Make_mvc.mak testclean
# > nmake -f Make_mvc.mak testgvim # > nmake -f Make_mvc.mak testgvim
# - check the output. # - check the output.
# - Rename "gvim.exe" to "gvim_ole.exe". # - Rename "gvim.exe" to "gvim_ole.exe".
@ -473,6 +475,7 @@ runtime_unix2dos: dosrt_files
| (cd ../../../runtime/dos; tar xf -) | (cd ../../../runtime/dos; tar xf -)
dosbin: prepare dosbin_gvim dosbin_w32 dosbin_ole $(DOSBIN_S) dosbin: prepare dosbin_gvim dosbin_w32 dosbin_ole $(DOSBIN_S)
-rm $(IN_README_DIR)
# make Win32 gvim # make Win32 gvim
dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM) dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
@ -483,7 +486,6 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
tar cf - \ tar cf - \
$(BIN_DOS) \ $(BIN_DOS) \
| (cd dist/vim/$(VIMRTDIR); tar xf -) | (cd dist/vim/$(VIMRTDIR); tar xf -)
-rm $(IN_README_DIR)
cp gvim.exe dist/vim/$(VIMRTDIR)/gvim.exe cp gvim.exe dist/vim/$(VIMRTDIR)/gvim.exe
cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe

2
src/version.c
View File

@ -763,6 +763,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 */
/**/
2288,
/**/ /**/
2287, 2287,
/**/ /**/

6
tools/rename.bat Normal file
View File

@ -0,0 +1,6 @@
mv vim.exe vimw32.exe
mv tee/tee.exe teew32.exe
mv xxd/xxd.exe xxdw32.exe
mv vim.pdb vimw32.pdb
mv install.exe installw32.exe
mv uninstal.exe uninstalw32.exe