From 818c9e7edfce339eff7cb357f2ec29a72afd1977 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 19 Mar 2016 16:09:42 +0100 Subject: [PATCH] patch 7.4.1601 Problem: README files take a lot of space in the top directory. Solution: Move most of them to "READMEdir". --- Filelist | 22 ++++++++++ Makefile | 40 ++++++++---------- README.txt.info => READMEdir/README.txt.info | Bin README_ami.txt => READMEdir/README_ami.txt | 0 .../README_ami.txt.info | Bin .../README_amibin.txt | 0 .../README_amibin.txt.info | Bin .../README_amisrc.txt | 0 .../README_amisrc.txt.info | Bin .../README_bindos.txt | 0 README_dos.txt => READMEdir/README_dos.txt | 0 .../README_extra.txt | 0 README_mac.txt => READMEdir/README_mac.txt | 0 README_ole.txt => READMEdir/README_ole.txt | 0 README_os2.txt => READMEdir/README_os2.txt | 0 .../README_os390.txt | 0 README_src.txt => READMEdir/README_src.txt | 0 .../README_srcdos.txt | 0 README_unix.txt => READMEdir/README_unix.txt | 0 README_vms.txt => READMEdir/README_vms.txt | 0 README_w32s.txt => READMEdir/README_w32s.txt | 0 src/version.c | 2 + 22 files changed, 42 insertions(+), 22 deletions(-) rename README.txt.info => READMEdir/README.txt.info (100%) mode change 100755 => 100644 rename README_ami.txt => READMEdir/README_ami.txt (100%) rename README_ami.txt.info => READMEdir/README_ami.txt.info (100%) mode change 100755 => 100644 rename README_amibin.txt => READMEdir/README_amibin.txt (100%) rename README_amibin.txt.info => READMEdir/README_amibin.txt.info (100%) mode change 100755 => 100644 rename README_amisrc.txt => READMEdir/README_amisrc.txt (100%) rename README_amisrc.txt.info => READMEdir/README_amisrc.txt.info (100%) mode change 100755 => 100644 rename README_bindos.txt => READMEdir/README_bindos.txt (100%) rename README_dos.txt => READMEdir/README_dos.txt (100%) rename README_extra.txt => READMEdir/README_extra.txt (100%) rename README_mac.txt => READMEdir/README_mac.txt (100%) rename README_ole.txt => READMEdir/README_ole.txt (100%) rename README_os2.txt => READMEdir/README_os2.txt (100%) rename README_os390.txt => READMEdir/README_os390.txt (100%) rename README_src.txt => READMEdir/README_src.txt (100%) rename README_srcdos.txt => READMEdir/README_srcdos.txt (100%) rename README_unix.txt => READMEdir/README_unix.txt (100%) rename README_vms.txt => READMEdir/README_vms.txt (100%) rename README_w32s.txt => READMEdir/README_w32s.txt (100%) diff --git a/Filelist b/Filelist index d74e586bf0..5eab8b49a6 100644 --- a/Filelist +++ b/Filelist @@ -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 \ diff --git a/Makefile b/Makefile index 8e54a32bdf..2c7e5a285e 100644 --- a/Makefile +++ b/Makefile @@ -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 old mode 100755 new mode 100644 similarity index 100% rename from README.txt.info rename to READMEdir/README.txt.info diff --git a/README_ami.txt b/READMEdir/README_ami.txt similarity index 100% rename from README_ami.txt rename to READMEdir/README_ami.txt diff --git a/README_ami.txt.info b/READMEdir/README_ami.txt.info old mode 100755 new mode 100644 similarity index 100% rename from README_ami.txt.info rename to READMEdir/README_ami.txt.info diff --git a/README_amibin.txt b/READMEdir/README_amibin.txt similarity index 100% rename from README_amibin.txt rename to READMEdir/README_amibin.txt diff --git a/README_amibin.txt.info b/READMEdir/README_amibin.txt.info old mode 100755 new mode 100644 similarity index 100% rename from README_amibin.txt.info rename to READMEdir/README_amibin.txt.info diff --git a/README_amisrc.txt b/READMEdir/README_amisrc.txt similarity index 100% rename from README_amisrc.txt rename to READMEdir/README_amisrc.txt diff --git a/README_amisrc.txt.info b/READMEdir/README_amisrc.txt.info old mode 100755 new mode 100644 similarity index 100% rename from README_amisrc.txt.info rename to READMEdir/README_amisrc.txt.info diff --git a/README_bindos.txt b/READMEdir/README_bindos.txt similarity index 100% rename from README_bindos.txt rename to READMEdir/README_bindos.txt diff --git a/README_dos.txt b/READMEdir/README_dos.txt similarity index 100% rename from README_dos.txt rename to READMEdir/README_dos.txt diff --git a/README_extra.txt b/READMEdir/README_extra.txt similarity index 100% rename from README_extra.txt rename to READMEdir/README_extra.txt diff --git a/README_mac.txt b/READMEdir/README_mac.txt similarity index 100% rename from README_mac.txt rename to READMEdir/README_mac.txt diff --git a/README_ole.txt b/READMEdir/README_ole.txt similarity index 100% rename from README_ole.txt rename to READMEdir/README_ole.txt diff --git a/README_os2.txt b/READMEdir/README_os2.txt similarity index 100% rename from README_os2.txt rename to READMEdir/README_os2.txt diff --git a/README_os390.txt b/READMEdir/README_os390.txt similarity index 100% rename from README_os390.txt rename to READMEdir/README_os390.txt diff --git a/README_src.txt b/READMEdir/README_src.txt similarity index 100% rename from README_src.txt rename to READMEdir/README_src.txt diff --git a/README_srcdos.txt b/READMEdir/README_srcdos.txt similarity index 100% rename from README_srcdos.txt rename to READMEdir/README_srcdos.txt diff --git a/README_unix.txt b/READMEdir/README_unix.txt similarity index 100% rename from README_unix.txt rename to READMEdir/README_unix.txt diff --git a/README_vms.txt b/READMEdir/README_vms.txt similarity index 100% rename from README_vms.txt rename to READMEdir/README_vms.txt diff --git a/README_w32s.txt b/READMEdir/README_w32s.txt similarity index 100% rename from README_w32s.txt rename to READMEdir/README_w32s.txt diff --git a/src/version.c b/src/version.c index d66ca9b253..61b8ca92db 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1601, /**/ 1600, /**/