patch 7.4.2288
Problem: MS-Windows build instructions are clumsy. "dosbin" doesn't build.
Solution: Add rename.bat. Fix building "dosbin".
diff --git a/Filelist b/Filelist
index 13ebafc..7334e5e 100644
--- a/Filelist
+++ b/Filelist
@@ -316,6 +316,7 @@
src/Make_dvc.mak \
src/Make_ming.mak \
src/Make_mvc.mak \
+ tools/rename.bat \
src/bigvim.bat \
src/bigvim64.bat \
src/msvcsetup.bat \
diff --git a/Makefile b/Makefile
index 962d6d4..cdc4a76 100644
--- a/Makefile
+++ b/Makefile
@@ -137,19 +137,21 @@
# - > 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 @@
# 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 @@
| (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 @@
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 8ed1a13..1de38c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
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 0000000..d66b0d3
--- /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
