diff options
| -rw-r--r-- | Filelist | 22 | ||||
| -rw-r--r-- | Makefile | 40 | ||||
| -rw-r--r--[-rwxr-xr-x] | READMEdir/README.txt.info (renamed from README.txt.info) | bin | 582 -> 582 bytes | |||
| -rw-r--r-- | READMEdir/README_ami.txt (renamed from README_ami.txt) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | READMEdir/README_ami.txt.info (renamed from README_ami.txt.info) | bin | 582 -> 582 bytes | |||
| -rw-r--r-- | READMEdir/README_amibin.txt (renamed from README_amibin.txt) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | READMEdir/README_amibin.txt.info (renamed from README_amibin.txt.info) | bin | 582 -> 582 bytes | |||
| -rw-r--r-- | READMEdir/README_amisrc.txt (renamed from README_amisrc.txt) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | READMEdir/README_amisrc.txt.info (renamed from README_amisrc.txt.info) | bin | 582 -> 582 bytes | |||
| -rw-r--r-- | READMEdir/README_bindos.txt (renamed from README_bindos.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_dos.txt (renamed from README_dos.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_extra.txt (renamed from README_extra.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_mac.txt (renamed from README_mac.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_ole.txt (renamed from README_ole.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_os2.txt (renamed from README_os2.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_os390.txt (renamed from README_os390.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_src.txt (renamed from README_src.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_srcdos.txt (renamed from README_srcdos.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_unix.txt (renamed from README_unix.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_vms.txt (renamed from README_vms.txt) | 0 | ||||
| -rw-r--r-- | READMEdir/README_w32s.txt (renamed from README_w32s.txt) | 0 | ||||
| -rw-r--r-- | src/version.c | 2 |
22 files changed, 42 insertions, 22 deletions
@@ -692,6 +692,28 @@ EXTRA = \ src/tee/Make_mvc.mak \ src/tee/tee.c \ +# files in READMEdir that are included from the top dir +IN_README_DIR = \ + README.txt.info \ + README_ami.txt \ + README_ami.txt.info \ + README_amibin.txt \ + README_amibin.txt.info \ + README_amisrc.txt \ + README_amisrc.txt.info \ + README_bindos.txt \ + README_dos.txt \ + README_extra.txt \ + README_mac.txt \ + README_ole.txt \ + README_os2.txt \ + README_os390.txt \ + README_src.txt \ + README_srcdos.txt \ + README_unix.txt \ + README_vms.txt \ + README_w32s.txt \ + # generic language files LANG_GEN = \ runtime/doc/*-de.1 \ @@ -213,24 +213,13 @@ MINOR = 4 # > bigvim64.bat # # -# OBSOLETE systems: You can build this if you have an appropriate system. +# OBSOLETE systems: You can build these if you have an appropriate system. # -# 16 bit DOS version: (doesn't build anywhere) -# - Set environment for compiling with Borland C++ 3.1. -# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that -# case set environment for compiling with Borland C++ 4.0 and do -# "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe"). -# NOTE: this currently fails because Vim is too big. -# - "make test" and check the output. -# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and -# "uninstald16.exe". +# 16 bit DOS version: You need to get a very old version of Vim, for several +# years even the tiny build is too big to fit in DOS memory. # -# 32 bit DOS version: (requires Windows XP or earlier) -# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak". -# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for -# "ALL DONE". -# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and -# "uninstald32.exe". +# 32 bit DOS version: Support was removed in 7.4.1399. When syncing to before +# that it probably won't build. # # Win32s GUI version: (requires a very old compiler) # - Set environment for Visual C++ 4.1 (requires a new console window): @@ -242,12 +231,9 @@ MINOR = 4 # - Rename "uninstal.exe" to "uninstalw32.exe" # - The produced uninstalw32.exe and vimrun.exe are used. # -# OS/2: (requires an OS/2 system) -# - Unpack the Unix archive. -# - "make -f Make_os2.mak". -# - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy -# them to here. -# - "make os2bin". +# OS/2 support was removed in patch 7.4.1008. If you want to give it a try +# sync to before that and check the old version of this Makefile for +# instructions. VIMVER = vim-$(MAJOR).$(MINOR) VERSION = $(MAJOR)$(MINOR) @@ -269,9 +255,13 @@ dist: mkdir dist # Clean up some files to avoid they are included. +# Copy README files to the top directory. prepare: if test -f runtime/doc/uganda.nsis.txt; then \ rm runtime/doc/uganda.nsis.txt; fi + for name in $(IN_README_DIR); do \ + cp READMEdir/"$$name" .; \ + done # For the zip files we need to create a file with the comment line dist/comment: @@ -336,6 +326,7 @@ unixall: dist prepare $(EXTRA) \ $(LANG_SRC) \ | (cd dist/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) # Need to use a "distclean" config.mk file # Note: this file is not included in the repository to avoid problems, but it's # OK to put it in the archive. @@ -372,6 +363,7 @@ amirt: dist prepare $(RT_NO_UNIX) \ $(RT_AMI_DOS) \ | (cd dist/Vim/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) mv dist/Vim/$(VIMRTDIR)/vimdir.info dist/Vim.info mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info mv dist/Vim/$(VIMRTDIR)/runtime/* dist/Vim/$(VIMRTDIR) @@ -392,6 +384,7 @@ amibin: dist prepare Vim \ Xxd \ | (cd dist/Vim/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) mv dist/Vim/$(VIMRTDIR)/vimdir.info dist/Vim.info mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info cd dist && tar cf vim$(VERSION)bin.tar Vim Vim.info @@ -410,6 +403,7 @@ amisrc: dist prepare $(SRC_AMI) \ $(SRC_AMI_DOS) \ | (cd dist/Vim/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) mv dist/Vim/$(VIMRTDIR)/vimdir.info dist/Vim.info mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info cd dist && tar cf vim$(VERSION)src.tar Vim Vim.info @@ -483,6 +477,7 @@ dosrt_files: dist prepare no_title.vim $(RT_DOS_BIN) \ $(LANG_GEN_BIN) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) + -rm $(IN_README_DIR) mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR) rmdir dist/vim/$(VIMRTDIR)/runtime # Add the message translations. Trick: skip ja.mo and use ja.sjis.mo instead. @@ -517,6 +512,7 @@ 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 xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe diff --git a/README.txt.info b/READMEdir/README.txt.info Binary files differindex e7fa11494..e7fa11494 100755..100644 --- a/README.txt.info +++ b/READMEdir/README.txt.info diff --git a/README_ami.txt b/READMEdir/README_ami.txt index 03cb6e24a..03cb6e24a 100644 --- a/README_ami.txt +++ b/READMEdir/README_ami.txt diff --git a/README_ami.txt.info b/READMEdir/README_ami.txt.info Binary files differindex 912436d6a..912436d6a 100755..100644 --- a/README_ami.txt.info +++ b/READMEdir/README_ami.txt.info diff --git a/README_amibin.txt b/READMEdir/README_amibin.txt index fbf5ba4c4..fbf5ba4c4 100644 --- a/README_amibin.txt +++ b/READMEdir/README_amibin.txt diff --git a/README_amibin.txt.info b/READMEdir/README_amibin.txt.info Binary files differindex bdc3f028e..bdc3f028e 100755..100644 --- a/README_amibin.txt.info +++ b/READMEdir/README_amibin.txt.info diff --git a/README_amisrc.txt b/READMEdir/README_amisrc.txt index ddc58be95..ddc58be95 100644 --- a/README_amisrc.txt +++ b/READMEdir/README_amisrc.txt diff --git a/README_amisrc.txt.info b/READMEdir/README_amisrc.txt.info Binary files differindex 476af9ac0..476af9ac0 100755..100644 --- a/README_amisrc.txt.info +++ b/READMEdir/README_amisrc.txt.info diff --git a/README_bindos.txt b/READMEdir/README_bindos.txt index 03c7c19ec..03c7c19ec 100644 --- a/README_bindos.txt +++ b/READMEdir/README_bindos.txt diff --git a/README_dos.txt b/READMEdir/README_dos.txt index 662a7e785..662a7e785 100644 --- a/README_dos.txt +++ b/READMEdir/README_dos.txt diff --git a/README_extra.txt b/READMEdir/README_extra.txt index e496912dc..e496912dc 100644 --- a/README_extra.txt +++ b/READMEdir/README_extra.txt diff --git a/README_mac.txt b/READMEdir/README_mac.txt index 08888d9bb..08888d9bb 100644 --- a/README_mac.txt +++ b/READMEdir/README_mac.txt diff --git a/README_ole.txt b/READMEdir/README_ole.txt index 233c0532f..233c0532f 100644 --- a/README_ole.txt +++ b/READMEdir/README_ole.txt diff --git a/README_os2.txt b/READMEdir/README_os2.txt index 5f2ebc755..5f2ebc755 100644 --- a/README_os2.txt +++ b/READMEdir/README_os2.txt diff --git a/README_os390.txt b/READMEdir/README_os390.txt index 502b6f8b1..502b6f8b1 100644 --- a/README_os390.txt +++ b/READMEdir/README_os390.txt diff --git a/README_src.txt b/READMEdir/README_src.txt index 3af95f23c..3af95f23c 100644 --- a/README_src.txt +++ b/READMEdir/README_src.txt diff --git a/README_srcdos.txt b/READMEdir/README_srcdos.txt index 1b7cbcf5c..1b7cbcf5c 100644 --- a/README_srcdos.txt +++ b/READMEdir/README_srcdos.txt diff --git a/README_unix.txt b/READMEdir/README_unix.txt index 7aff642c6..7aff642c6 100644 --- a/README_unix.txt +++ b/READMEdir/README_unix.txt diff --git a/README_vms.txt b/READMEdir/README_vms.txt index 53364a127..53364a127 100644 --- a/README_vms.txt +++ b/READMEdir/README_vms.txt diff --git a/README_w32s.txt b/READMEdir/README_w32s.txt index 0b5d1aee0..0b5d1aee0 100644 --- a/README_w32s.txt +++ b/READMEdir/README_w32s.txt diff --git a/src/version.c b/src/version.c index d66ca9b25..61b8ca92d 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1601, +/**/ 1600, /**/ 1599, |