Mercurial > vim

comparison Makefile @ 10028:62b7fb15ff7e v7.4.2286

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/fec246d2c595164ac3b7e9fe9677053d3739b834 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Aug 28 18:47:14 2016 +0200 patch 7.4.2286 Problem: The tee program isn't included. Makefile contains build instructions that don't work. Solution: Update the Filelist and build instructions. Remove build instructions for DOS and old Windows. Add the tee program.
author Christian Brabandt <cb@256bit.org>
date Sun, 28 Aug 2016 19:00:06 +0200
parents 271f3ae34835
children f0b1cbf9467e
comparison
equal deleted inserted replaced
10027:018fead968c1 10028:62b7fb15ff7e
49 # 49 #
50 # html vim##html.zip HTML docs 50 # html vim##html.zip HTML docs
51 # 51 #
52 # dossrc vim##src.zip sources for MS-DOS 52 # dossrc vim##src.zip sources for MS-DOS
53 # dosrt vim##rt.zip runtime for MS-DOS 53 # dosrt vim##rt.zip runtime for MS-DOS
54 # dosbin vim##d16.zip binary for MS-DOS 16 bits 54 # dosbin vim##w32.zip binary for Win32
55 # vim##d32.zip binary for MS-DOS 32 bits
56 # vim##w32.zip binary for Win32
57 # gvim##.zip binary for GUI Win32 55 # gvim##.zip binary for GUI Win32
58 # gvim##ole.zip OLE exe for Win32 GUI 56 # gvim##ole.zip OLE exe for Win32 GUI
59 # gvim##_s.zip exe for Win32s GUI
60 # 57 #
61 # OBSOLETE 58 # OBSOLETE
62 # amisrc vim##src.tgz sources for Amiga 59 # amisrc vim##src.tgz sources for Amiga
63 # amirt vim##rt.tgz runtime for Amiga 60 # amirt vim##rt.tgz runtime for Amiga
64 # amibin vim##bin.tgz binary for Amiga 61 # amibin vim##bin.tgz binary for Amiga
70 # To do all this you need the Unix archive and compiled binaries. 67 # To do all this you need the Unix archive and compiled binaries.
71 # Before creating an archive first delete all backup files, *.orig, etc. 68 # Before creating an archive first delete all backup files, *.orig, etc.
72 69
73 MAJOR = 7 70 MAJOR = 7
74 MINOR = 4 71 MINOR = 4
75
76 # Uncomment this line if the Win32s version is to be included.
77 # DOSBIN_S = dosbin_s
78
79 # Uncomment this line if the 16 bit DOS version is to be included.
80 # DOSBIN_D16 = dosbin_d16
81
82 # Uncomment this line if the 32 bit DOS version is to be included.
83 # DOSBIN_D32 = dosbin_d32
84 72
85 # CHECKLIST for creating a new version: 73 # CHECKLIST for creating a new version:
86 # 74 #
87 # - Update Vim version number. For a test version in: src/version.h, Contents, 75 # - Update Vim version number. For a test version in: src/version.h, Contents,
88 # MAJOR/MINOR above, VIMMAJOR and VIMMINOR in src/Makefile, README*.txt, 76 # MAJOR/MINOR above, VIMMAJOR and VIMMINOR in src/Makefile, README*.txt,
150 # > nmake -f Make_mvc.mak 138 # > nmake -f Make_mvc.mak
151 # - Run the tests: 139 # - Run the tests:
152 # > rm testdir/*.out testdir/*.res 140 # > rm testdir/*.out testdir/*.res
153 # > nmake -f Make_mvc.mak test 141 # > nmake -f Make_mvc.mak test
154 # - check the output. 142 # - check the output.
155 # - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe. 143 # - Rename: vim.exe to vimw32.exe,
144 # tee/tee.exe to teew32.exe,
145 # xxd/xxd.exe to xxdw32.exe
156 # - Rename vim.pdb to vimw32.pdb. 146 # - Rename vim.pdb to vimw32.pdb.
157 # - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe. 147 # - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe.
158 # Win32 GUI version build: 148 # Win32 GUI version build:
159 # - > cd src 149 # - > cd src
160 # > nmake -f Make_mvc.mak GUI=yes 150 # > nmake -f Make_mvc.mak GUI=yes
185 # - in this directory: 175 # - in this directory:
186 # > make dosbin 176 # > make dosbin
187 # NSIS self installing exe: 177 # NSIS self installing exe:
188 # - To get NSIS see http://nsis.sourceforge.net 178 # - To get NSIS see http://nsis.sourceforge.net
189 # - Make sure gvim_ole.exe, vimw32.exe, installw32.exe, 179 # - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
190 # uninstalw32.exe and xxdw32.exe have been build as mentioned above. 180 # uninstalw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
181 # above.
191 # - copy these files (get them from a binary archive or build them): 182 # - copy these files (get them from a binary archive or build them):
192 # gvimext.dll in src/GvimExt 183 # gvimext.dll in src/GvimExt
193 # gvimext64.dll in src/GvimExt 184 # gvimext64.dll in src/GvimExt
194 # VisVim.dll in src/VisVim 185 # VisVim.dll in src/VisVim
195 # Note: VisVim needs to be build with MSVC 5, newer versions don't work. 186 # Note: VisVim needs to be build with MSVC 5, newer versions don't work.
219 # years even the tiny build is too big to fit in DOS memory. 210 # years even the tiny build is too big to fit in DOS memory.
220 # 211 #
221 # 32 bit DOS version: Support was removed in 7.4.1399. When syncing to before 212 # 32 bit DOS version: Support was removed in 7.4.1399. When syncing to before
222 # that it probably won't build. 213 # that it probably won't build.
223 # 214 #
224 # Win32s GUI version: (requires a very old compiler) 215 # Win32s GUI version: Support was removed in patch 7.4.1364.
225 # - Set environment for Visual C++ 4.1 (requires a new console window):
226 # "vcvars32.bat" (use the path for VC 4.1 e:\msdev\bin)
227 # - "nmake -f Make_mvc.mak GUI=yes INTL=no clean" (use the path for VC 4.1)
228 # - "nmake -f Make_mvc.mak GUI=yes INTL=no" (use the path for VC 4.1)
229 # - Rename "gvim.exe" to "gvim_w32s.exe".
230 # - Rename "install.exe" to "installw32.exe"
231 # - Rename "uninstal.exe" to "uninstalw32.exe"
232 # - The produced uninstalw32.exe and vimrun.exe are used.
233 # 216 #
234 # OS/2 support was removed in patch 7.4.1008. If you want to give it a try 217 # 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 218 # sync to before that and check the old version of this Makefile for
236 # instructions. 219 # instructions.
237 220
266 # For the zip files we need to create a file with the comment line 249 # For the zip files we need to create a file with the comment line
267 dist/comment: 250 dist/comment:
268 mkdir dist/comment 251 mkdir dist/comment
269 252
270 COMMENT_RT = comment/$(VERSION)-rt 253 COMMENT_RT = comment/$(VERSION)-rt
271 COMMENT_D16 = comment/$(VERSION)-bin-d16
272 COMMENT_D32 = comment/$(VERSION)-bin-d32
273 COMMENT_W32 = comment/$(VERSION)-bin-w32 254 COMMENT_W32 = comment/$(VERSION)-bin-w32
274 COMMENT_GVIM = comment/$(VERSION)-bin-gvim 255 COMMENT_GVIM = comment/$(VERSION)-bin-gvim
275 COMMENT_OLE = comment/$(VERSION)-bin-ole 256 COMMENT_OLE = comment/$(VERSION)-bin-ole
276 COMMENT_W32S = comment/$(VERSION)-bin-w32s
277 COMMENT_SRC = comment/$(VERSION)-src 257 COMMENT_SRC = comment/$(VERSION)-src
278 COMMENT_HTML = comment/$(VERSION)-html 258 COMMENT_HTML = comment/$(VERSION)-html
279 COMMENT_FARSI = comment/$(VERSION)-farsi 259 COMMENT_FARSI = comment/$(VERSION)-farsi
280 260
281 dist/$(COMMENT_RT): dist/comment 261 dist/$(COMMENT_RT): dist/comment
282 echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT) 262 echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT)
283 263
284 dist/$(COMMENT_D16): dist/comment
285 echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-DOS 16 bit real mode" > dist/$(COMMENT_D16)
286
287 dist/$(COMMENT_D32): dist/comment
288 echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-DOS 32 bit protected mode" > dist/$(COMMENT_D32)
289
290 dist/$(COMMENT_W32): dist/comment 264 dist/$(COMMENT_W32): dist/comment
291 echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows NT/95" > dist/$(COMMENT_W32) 265 echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows NT/95" > dist/$(COMMENT_W32)
292 266
293 dist/$(COMMENT_GVIM): dist/comment 267 dist/$(COMMENT_GVIM): dist/comment
294 echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows NT/95" > dist/$(COMMENT_GVIM) 268 echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows NT/95" > dist/$(COMMENT_GVIM)
295 269
296 dist/$(COMMENT_OLE): dist/comment 270 dist/$(COMMENT_OLE): dist/comment
297 echo "Vim - Vi IMproved - v$(VDOT) MS-Windows GUI binaries with OLE support" > dist/$(COMMENT_OLE) 271 echo "Vim - Vi IMproved - v$(VDOT) MS-Windows GUI binaries with OLE support" > dist/$(COMMENT_OLE)
298
299 dist/$(COMMENT_W32S): dist/comment
300 echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows 3.1/3.11" > dist/$(COMMENT_W32S)
301 272
302 dist/$(COMMENT_SRC): dist/comment 273 dist/$(COMMENT_SRC): dist/comment
303 echo "Vim - Vi IMproved - v$(VDOT) sources for MS-DOS and MS-Windows" > dist/$(COMMENT_SRC) 274 echo "Vim - Vi IMproved - v$(VDOT) sources for MS-DOS and MS-Windows" > dist/$(COMMENT_SRC)
304 275
305 dist/$(COMMENT_HTML): dist/comment 276 dist/$(COMMENT_HTML): dist/comment
499 runtime_unix2dos: dosrt_files 470 runtime_unix2dos: dosrt_files
500 -rm -rf `find runtime/dos -type f -print | sed -e /AAPDIR/d` 471 -rm -rf `find runtime/dos -type f -print | sed -e /AAPDIR/d`
501 cd dist/vim/$(VIMRTDIR); tar cf - * \ 472 cd dist/vim/$(VIMRTDIR); tar cf - * \
502 | (cd ../../../runtime/dos; tar xf -) 473 | (cd ../../../runtime/dos; tar xf -)
503 474
504 dosbin: prepare dosbin_gvim dosbin_w32 $(DOSBIN_D32) dosbin_ole $(DOSBIN_S) $(DOSBIN_D16) 475 dosbin: prepare dosbin_gvim dosbin_w32 dosbin_ole $(DOSBIN_S)
505 476
506 # make Win32 gvim 477 # make Win32 gvim
507 dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM) 478 dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
508 -rm -rf dist/gvim$(VERSION).zip 479 -rm -rf dist/gvim$(VERSION).zip
509 -rm -rf dist/vim 480 -rm -rf dist/vim
512 tar cf - \ 483 tar cf - \
513 $(BIN_DOS) \ 484 $(BIN_DOS) \
514 | (cd dist/vim/$(VIMRTDIR); tar xf -) 485 | (cd dist/vim/$(VIMRTDIR); tar xf -)
515 -rm $(IN_README_DIR) 486 -rm $(IN_README_DIR)
516 cp gvim.exe dist/vim/$(VIMRTDIR)/gvim.exe 487 cp gvim.exe dist/vim/$(VIMRTDIR)/gvim.exe
488 cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe
517 cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe 489 cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
518 cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe 490 cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
519 cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe 491 cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
520 cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe 492 cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
521 cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll 493 cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
530 mkdir dist/vim/$(VIMRTDIR) 502 mkdir dist/vim/$(VIMRTDIR)
531 tar cf - \ 503 tar cf - \
532 $(BIN_DOS) \ 504 $(BIN_DOS) \
533 | (cd dist/vim/$(VIMRTDIR); tar xf -) 505 | (cd dist/vim/$(VIMRTDIR); tar xf -)
534 cp vimw32.exe dist/vim/$(VIMRTDIR)/vim.exe 506 cp vimw32.exe dist/vim/$(VIMRTDIR)/vim.exe
507 cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe
535 cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe 508 cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
536 cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe 509 cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
537 cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe 510 cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
538 cd dist && zip -9 -rD -z vim$(VERSION)w32.zip vim <$(COMMENT_W32) 511 cd dist && zip -9 -rD -z vim$(VERSION)w32.zip vim <$(COMMENT_W32)
539 cp vimw32.pdb dist/vim$(VERSION)w32.pdb 512 cp vimw32.pdb dist/vim$(VERSION)w32.pdb
540
541 # make 32bit DOS
542 dosbin_d32: dist no_title.vim dist/$(COMMENT_D32)
543 -rm -rf dist/vim$(VERSION)d32.zip
544 -rm -rf dist/vim
545 mkdir dist/vim
546 mkdir dist/vim/$(VIMRTDIR)
547 tar cf - \
548 $(BIN_DOS) \
549 | (cd dist/vim/$(VIMRTDIR); tar xf -)
550 cp vimd32.exe dist/vim/$(VIMRTDIR)/vim.exe
551 cp xxdd32.exe dist/vim/$(VIMRTDIR)/xxd.exe
552 cp installd32.exe dist/vim/$(VIMRTDIR)/install.exe
553 cp uninstald32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
554 cp csdpmi4b.zip dist/vim/$(VIMRTDIR)
555 cd dist && zip -9 -rD -z vim$(VERSION)d32.zip vim <$(COMMENT_D32)
556
557 # make 16bit DOS
558 dosbin_d16: dist no_title.vim dist/$(COMMENT_D16)
559 -rm -rf dist/vim$(VERSION)d16.zip
560 -rm -rf dist/vim
561 mkdir dist/vim
562 mkdir dist/vim/$(VIMRTDIR)
563 tar cf - \
564 $(BIN_DOS) \
565 | (cd dist/vim/$(VIMRTDIR); tar xf -)
566 cp vimd16.exe dist/vim/$(VIMRTDIR)/vim.exe
567 cp xxdd16.exe dist/vim/$(VIMRTDIR)/xxd.exe
568 cp installd16.exe dist/vim/$(VIMRTDIR)/install.exe
569 cp uninstald16.exe dist/vim/$(VIMRTDIR)/uninstal.exe
570 cd dist && zip -9 -rD -z vim$(VERSION)d16.zip vim <$(COMMENT_D16)
571 513
572 # make Win32 gvim with OLE 514 # make Win32 gvim with OLE
573 dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE) 515 dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
574 -rm -rf dist/gvim$(VERSION)ole.zip 516 -rm -rf dist/gvim$(VERSION)ole.zip
575 -rm -rf dist/vim 517 -rm -rf dist/vim
577 mkdir dist/vim/$(VIMRTDIR) 519 mkdir dist/vim/$(VIMRTDIR)
578 tar cf - \ 520 tar cf - \
579 $(BIN_DOS) \ 521 $(BIN_DOS) \
580 | (cd dist/vim/$(VIMRTDIR); tar xf -) 522 | (cd dist/vim/$(VIMRTDIR); tar xf -)
581 cp gvim_ole.exe dist/vim/$(VIMRTDIR)/gvim.exe 523 cp gvim_ole.exe dist/vim/$(VIMRTDIR)/gvim.exe
524 cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe
582 cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe 525 cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
583 cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe 526 cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
584 cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe 527 cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
585 cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe 528 cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
586 cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll 529 cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
588 cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll 531 cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll
589 cp src/VisVim/README_VisVim.txt dist/vim/$(VIMRTDIR) 532 cp src/VisVim/README_VisVim.txt dist/vim/$(VIMRTDIR)
590 cd dist && zip -9 -rD -z gvim$(VERSION)ole.zip vim <$(COMMENT_OLE) 533 cd dist && zip -9 -rD -z gvim$(VERSION)ole.zip vim <$(COMMENT_OLE)
591 cp gvim_ole.pdb dist/gvim$(VERSION)ole.pdb 534 cp gvim_ole.pdb dist/gvim$(VERSION)ole.pdb
592 535
593 # make Win32s gvim
594 dosbin_s: dist no_title.vim dist/$(COMMENT_W32S)
595 -rm -rf dist/gvim$(VERSION)_s.zip
596 -rm -rf dist/vim
597 mkdir dist/vim
598 mkdir dist/vim/$(VIMRTDIR)
599 tar cf - \
600 $(BIN_DOS) \
601 | (cd dist/vim/$(VIMRTDIR); tar xf -)
602 cp gvim_w32s.exe dist/vim/$(VIMRTDIR)/gvim.exe
603 cp xxdd32.exe dist/vim/$(VIMRTDIR)/xxd.exe
604 cp README_w32s.txt dist/vim/$(VIMRTDIR)
605 cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
606 cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
607 cd dist && zip -9 -rD -z gvim$(VERSION)_s.zip vim <$(COMMENT_W32S)
608
609 html: dist dist/$(COMMENT_HTML) 536 html: dist dist/$(COMMENT_HTML)
610 -rm -rf dist/vim$(VERSION)html.zip 537 -rm -rf dist/vim$(VERSION)html.zip
611 cd runtime/doc && zip -9 -z ../../dist/vim$(VERSION)html.zip *.html <../../dist/$(COMMENT_HTML) 538 cd runtime/doc && zip -9 -z ../../dist/vim$(VERSION)html.zip *.html <../../dist/$(COMMENT_HTML)
612 539
613 farsi: dist dist/$(COMMENT_FARSI) 540 farsi: dist dist/$(COMMENT_FARSI)