diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-28 20:14:38 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-28 20:14:38 +0200 |
| commit | cb03397abae22e7237511db2e19ad5ef3e5e5f4e (patch) | |
| tree | ffd1d27048da0ec9b8e3f48221ef260eb029f89c | |
| parent | 6fc8227ebfbdfbbb48b81b679db81f421dbce79b (diff) | |
| download | vim-cb03397abae22e7237511db2e19ad5ef3e5e5f4e.zip | |
patch 7.4.2288
Problem: MS-Windows build instructions are clumsy. "dosbin" doesn't build.
Solution: Add rename.bat. Fix building "dosbin".
| -rw-r--r-- | Filelist | 1 | ||||
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | tools/rename.bat | 6 |
4 files changed, 19 insertions, 8 deletions
@@ -316,6 +316,7 @@ SRC_DOS = \ src/Make_dvc.mak \ src/Make_ming.mak \ src/Make_mvc.mak \ + tools/rename.bat \ src/bigvim.bat \ src/bigvim64.bat \ src/msvcsetup.bat \ @@ -137,19 +137,21 @@ MINOR = 4 # - > cd src # > nmake -f Make_mvc.mak # - Run the tests: -# > rm testdir/*.out testdir/*.res +# > nmake -f Make_mvc.mak testclean # > nmake -f Make_mvc.mak test # - check the output. -# - Rename: vim.exe to vimw32.exe, -# tee/tee.exe to teew32.exe, +# - Rename (using tools/rename.bat): +# 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. +# 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: -# > rm testdir/*.out testdir/*.res +# > 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,7 +165,7 @@ MINOR = 4 # 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 testclean # > nmake -f Make_mvc.mak testgvim # - check the output. # - Rename "gvim.exe" to "gvim_ole.exe". @@ -473,6 +475,7 @@ runtime_unix2dos: dosrt_files | (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,7 +486,6 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM) 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 diff --git a/src/version.c b/src/version.c index 8ed1a1396..1de38c80c 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2288, +/**/ 2287, /**/ 2286, diff --git a/tools/rename.bat b/tools/rename.bat new file mode 100644 index 000000000..d66b0d33f --- /dev/null +++ b/tools/rename.bat @@ -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 |