Skip to content

Commit 818c9e7

Browse files
committed
patch 7.4.1601
Problem: README files take a lot of space in the top directory. Solution: Move most of them to "READMEdir".
1 parent 062cc18 commit 818c9e7

22 files changed

Lines changed: 42 additions & 22 deletions

Filelist

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,28 @@ EXTRA = \
692692
src/tee/Make_mvc.mak \
693693
src/tee/tee.c \
694694

695+
# files in READMEdir that are included from the top dir
696+
IN_README_DIR = \
697+
README.txt.info \
698+
README_ami.txt \
699+
README_ami.txt.info \
700+
README_amibin.txt \
701+
README_amibin.txt.info \
702+
README_amisrc.txt \
703+
README_amisrc.txt.info \
704+
README_bindos.txt \
705+
README_dos.txt \
706+
README_extra.txt \
707+
README_mac.txt \
708+
README_ole.txt \
709+
README_os2.txt \
710+
README_os390.txt \
711+
README_src.txt \
712+
README_srcdos.txt \
713+
README_unix.txt \
714+
README_vms.txt \
715+
README_w32s.txt \
716+
695717
# generic language files
696718
LANG_GEN = \
697719
runtime/doc/*-de.1 \

Makefile

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -213,24 +213,13 @@ MINOR = 4
213213
# > bigvim64.bat
214214
#
215215
#
216-
# OBSOLETE systems: You can build this if you have an appropriate system.
216+
# OBSOLETE systems: You can build these if you have an appropriate system.
217217
#
218-
# 16 bit DOS version: (doesn't build anywhere)
219-
# - Set environment for compiling with Borland C++ 3.1.
220-
# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
221-
# case set environment for compiling with Borland C++ 4.0 and do
222-
# "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
223-
# NOTE: this currently fails because Vim is too big.
224-
# - "make test" and check the output.
225-
# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
226-
# "uninstald16.exe".
218+
# 16 bit DOS version: You need to get a very old version of Vim, for several
219+
# years even the tiny build is too big to fit in DOS memory.
227220
#
228-
# 32 bit DOS version: (requires Windows XP or earlier)
229-
# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
230-
# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
231-
# "ALL DONE".
232-
# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
233-
# "uninstald32.exe".
221+
# 32 bit DOS version: Support was removed in 7.4.1399. When syncing to before
222+
# that it probably won't build.
234223
#
235224
# Win32s GUI version: (requires a very old compiler)
236225
# - Set environment for Visual C++ 4.1 (requires a new console window):
@@ -242,12 +231,9 @@ MINOR = 4
242231
# - Rename "uninstal.exe" to "uninstalw32.exe"
243232
# - The produced uninstalw32.exe and vimrun.exe are used.
244233
#
245-
# OS/2: (requires an OS/2 system)
246-
# - Unpack the Unix archive.
247-
# - "make -f Make_os2.mak".
248-
# - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy
249-
# them to here.
250-
# - "make os2bin".
234+
# OS/2 support was removed in patch 7.4.1008. If you want to give it a try
235+
# sync to before that and check the old version of this Makefile for
236+
# instructions.
251237

252238
VIMVER = vim-$(MAJOR).$(MINOR)
253239
VERSION = $(MAJOR)$(MINOR)
@@ -269,9 +255,13 @@ dist:
269255
mkdir dist
270256

271257
# Clean up some files to avoid they are included.
258+
# Copy README files to the top directory.
272259
prepare:
273260
if test -f runtime/doc/uganda.nsis.txt; then \
274261
rm runtime/doc/uganda.nsis.txt; fi
262+
for name in $(IN_README_DIR); do \
263+
cp READMEdir/"$$name" .; \
264+
done
275265

276266
# For the zip files we need to create a file with the comment line
277267
dist/comment:
@@ -336,6 +326,7 @@ unixall: dist prepare
336326
$(EXTRA) \
337327
$(LANG_SRC) \
338328
| (cd dist/$(VIMRTDIR); tar xf -)
329+
-rm $(IN_README_DIR)
339330
# Need to use a "distclean" config.mk file
340331
# Note: this file is not included in the repository to avoid problems, but it's
341332
# OK to put it in the archive.
@@ -372,6 +363,7 @@ amirt: dist prepare
372363
$(RT_NO_UNIX) \
373364
$(RT_AMI_DOS) \
374365
| (cd dist/Vim/$(VIMRTDIR); tar xf -)
366+
-rm $(IN_README_DIR)
375367
mv dist/Vim/$(VIMRTDIR)/vimdir.info dist/Vim.info
376368
mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info
377369
mv dist/Vim/$(VIMRTDIR)/runtime/* dist/Vim/$(VIMRTDIR)
@@ -392,6 +384,7 @@ amibin: dist prepare
392384
Vim \
393385
Xxd \
394386
| (cd dist/Vim/$(VIMRTDIR); tar xf -)
387+
-rm $(IN_README_DIR)
395388
mv dist/Vim/$(VIMRTDIR)/vimdir.info dist/Vim.info
396389
mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info
397390
cd dist && tar cf vim$(VERSION)bin.tar Vim Vim.info
@@ -410,6 +403,7 @@ amisrc: dist prepare
410403
$(SRC_AMI) \
411404
$(SRC_AMI_DOS) \
412405
| (cd dist/Vim/$(VIMRTDIR); tar xf -)
406+
-rm $(IN_README_DIR)
413407
mv dist/Vim/$(VIMRTDIR)/vimdir.info dist/Vim.info
414408
mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info
415409
cd dist && tar cf vim$(VERSION)src.tar Vim Vim.info
@@ -483,6 +477,7 @@ dosrt_files: dist prepare no_title.vim
483477
$(RT_DOS_BIN) \
484478
$(LANG_GEN_BIN) \
485479
| (cd dist/vim/$(VIMRTDIR); tar xf -)
480+
-rm $(IN_README_DIR)
486481
mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
487482
rmdir dist/vim/$(VIMRTDIR)/runtime
488483
# 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)
517512
tar cf - \
518513
$(BIN_DOS) \
519514
| (cd dist/vim/$(VIMRTDIR); tar xf -)
515+
-rm $(IN_README_DIR)
520516
cp gvim.exe dist/vim/$(VIMRTDIR)/gvim.exe
521517
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
522518
cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
File renamed without changes.

0 commit comments

Comments
 (0)