To: vim_dev@googlegroups.com Subject: Patch 7.4.2288 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2288 Problem: MS-Windows build instructions are clumsy. "dosbin" doesn't build. Solution: Add rename.bat. Fix building "dosbin". Files: Makefile, Filelist, tools/rename.bat *** ../vim-7.4.2287/Makefile 2016-08-28 18:47:10.768482836 +0200 --- Makefile 2016-08-28 20:13:20.496064260 +0200 *************** *** 137,155 **** # - > cd src # > nmake -f Make_mvc.mak # - Run the tests: ! # > rm testdir/*.out testdir/*.res # > nmake -f Make_mvc.mak test # - check the output. ! # - Rename: vim.exe to vimw32.exe, ! # tee/tee.exe to teew32.exe, # xxd/xxd.exe to xxdw32.exe ! # - Rename vim.pdb to vimw32.pdb. ! # - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe. # Win32 GUI version build: # - > cd src # > nmake -f Make_mvc.mak GUI=yes # - Run the tests: ! # > rm testdir/*.out testdir/*.res # > nmake -f Make_mvc.mak testgvim # - check the output. # - move "gvim.exe" to here (otherwise the OLE version will overwrite it). --- 137,157 ---- # - > cd src # > nmake -f Make_mvc.mak # - Run the tests: ! # > nmake -f Make_mvc.mak testclean # > nmake -f Make_mvc.mak test # - check the output. ! # - Rename (using tools/rename.bat): ! # vim.exe to vimw32.exe ! # tee/tee.exe to teew32.exe # xxd/xxd.exe to xxdw32.exe ! # vim.pdb to vimw32.pdb ! # install.exe to installw32.exe ! # uninstal.exe to uninstalw32.exe # Win32 GUI version build: # - > cd src # > nmake -f Make_mvc.mak GUI=yes # - Run the tests: ! # > nmake -f Make_mvc.mak testclean # > nmake -f Make_mvc.mak testgvim # - check the output. # - move "gvim.exe" to here (otherwise the OLE version will overwrite it). *************** *** 163,169 **** # Adjust bigvim.bat to match the version of each interface you want. # > bigvim.bat # - Run the tests: ! # > rm testdir/*.out testdir/*.res # > nmake -f Make_mvc.mak testgvim # - check the output. # - Rename "gvim.exe" to "gvim_ole.exe". --- 165,171 ---- # Adjust bigvim.bat to match the version of each interface you want. # > bigvim.bat # - Run the tests: ! # > nmake -f Make_mvc.mak testclean # > nmake -f Make_mvc.mak testgvim # - check the output. # - Rename "gvim.exe" to "gvim_ole.exe". *************** *** 473,478 **** --- 475,481 ---- | (cd ../../../runtime/dos; tar xf -) dosbin: prepare dosbin_gvim dosbin_w32 dosbin_ole $(DOSBIN_S) + -rm $(IN_README_DIR) # make Win32 gvim dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM) *************** *** 483,489 **** tar cf - \ $(BIN_DOS) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) - -rm $(IN_README_DIR) cp gvim.exe dist/vim/$(VIMRTDIR)/gvim.exe cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe --- 486,491 ---- *** ../vim-7.4.2287/Filelist 2016-08-28 18:47:10.768482836 +0200 --- Filelist 2016-08-28 20:13:39.139901333 +0200 *************** *** 316,321 **** --- 316,322 ---- src/Make_dvc.mak \ src/Make_ming.mak \ src/Make_mvc.mak \ + tools/rename.bat \ src/bigvim.bat \ src/bigvim64.bat \ src/msvcsetup.bat \ *** ../vim-7.4.2287/tools/rename.bat 1970-01-01 01:00:00.000000000 +0100 --- tools/rename.bat 2016-08-28 19:36:27.915057500 +0200 *************** *** 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 *** ../vim-7.4.2287/src/version.c 2016-08-28 19:26:39.624111889 +0200 --- src/version.c 2016-08-28 20:11:37.628963452 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2288, /**/ -- # echo reboot >universe # chmod +x universe # ./universe /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///