comparison Makefile @ 34670:879a61a9aa07

NSIS: Possibility to include translated license and README.txt files (#14311) Commit: https://github.com/vim/vim/commit/74a23318467aecbb8e21535c6e8a27a257a0a14a Author: Restorer <69863286+RestorerZ@users.noreply.github.com> Date: Thu Mar 28 09:19:44 2024 +0000 NSIS: Possibility to include translated license and README.txt files (https://github.com/vim/vim/issues/14311) * NSIS: Possibility to include translated license and README.txt files * fixed a missing semicolon * Disable always show dialog choice language Signed-off-by: RestorerZ <restorer@mail2k.ru> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Thu, 28 Mar 2024 10:30:03 +0100
parents 4635e43f2c6f
children
comparison
equal deleted inserted replaced
34669:fe206762c077 34670:879a61a9aa07
265 265
266 # Clean up some files to avoid they are included. 266 # Clean up some files to avoid they are included.
267 # Copy README files to the top directory. 267 # Copy README files to the top directory.
268 prepare: 268 prepare:
269 if test -f runtime/doc/uganda.nsis.txt; then \ 269 if test -f runtime/doc/uganda.nsis.txt; then \
270 rm runtime/doc/uganda.nsis.txt; fi 270 rm runtime/doc/uganda.nsis.???; fi
271 for name in $(IN_README_DIR); do \ 271 for name in $(IN_README_DIR); do \
272 cp READMEdir/"$$name" .; \ 272 cp READMEdir/"$$name" .; \
273 done 273 done
274 274
275 # For the zip files we need to create a file with the comment line 275 # For the zip files we need to create a file with the comment line
405 mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info 405 mv dist/Vim/$(VIMRTDIR)/runtime.info dist/Vim/$(VIMRTDIR).info
406 cd dist && tar cf vim$(VERSION)src.tar Vim Vim.info 406 cd dist && tar cf vim$(VERSION)src.tar Vim Vim.info
407 gzip -9 dist/vim$(VERSION)src.tar 407 gzip -9 dist/vim$(VERSION)src.tar
408 mv dist/vim$(VERSION)src.tar.gz dist/vim$(VERSION)src.tgz 408 mv dist/vim$(VERSION)src.tar.gz dist/vim$(VERSION)src.tgz
409 409
410 no_title.vim: Makefile
411 echo "set notitle noicon nocp nomodeline viminfo=" >no_title.vim
412
413 # MS-DOS sources 410 # MS-DOS sources
414 dossrc: dist no_title.vim dist/$(COMMENT_SRC) \ 411 dossrc: dist dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt \
415 runtime/doc/uganda.nsis.txt \
416 nsis/gvim_version.nsh 412 nsis/gvim_version.nsh
417 -rm -rf dist/vim$(VERSION)src.zip 413 -rm -rf dist/vim$(VERSION)src.zip
418 -rm -rf dist/vim 414 -rm -rf dist/vim
419 mkdir dist/vim 415 mkdir dist/vim
420 mkdir dist/vim/$(VIMRTDIR) 416 mkdir dist/vim/$(VIMRTDIR)
422 $(SRC_ALL) \ 418 $(SRC_ALL) \
423 $(SRC_DOS) \ 419 $(SRC_DOS) \
424 $(SRC_DOS_BIN) \ 420 $(SRC_DOS_BIN) \
425 $(SRC_AMI_DOS) \ 421 $(SRC_AMI_DOS) \
426 $(SRC_DOS_UNIX) \ 422 $(SRC_DOS_UNIX) \
427 runtime/doc/uganda.nsis.txt \ 423 runtime/doc/uganda.nsis.??? \
428 nsis/gvim_version.nsh \ 424 nsis/gvim_version.nsh \
429 | (cd dist/vim/$(VIMRTDIR); tar xf -) 425 | (cd dist/vim/$(VIMRTDIR); tar xf -)
430 mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR) 426 mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
431 rmdir dist/vim/$(VIMRTDIR)/runtime 427 rmdir dist/vim/$(VIMRTDIR)/runtime
432 # This file needs to be in dos fileformat for NSIS.
433 $(VIM) -e -X -u no_title.vim -c ":set tx|wq" dist/vim/$(VIMRTDIR)/doc/uganda.nsis.txt
434 cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC) 428 cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)
435 429
436 runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt 430 runtime/doc/uganda.nsis.txt: runtime/doc/uganda.???
437 cd runtime/doc && $(MAKE) uganda.nsis.txt 431 cd runtime/doc && $(MAKE) uganda.nsis.txt
438 432
439 nsis/gvim_version.nsh: Makefile 433 nsis/gvim_version.nsh: Makefile
440 echo "# Generated from Makefile: define the version numbers" > $@ 434 echo "# Generated from Makefile: define the version numbers" > $@
441 echo "!ifndef __GVIM_VER__NSH__" >> $@ 435 echo "!ifndef __GVIM_VER__NSH__" >> $@
448 -rm -rf dist/vim$(VERSION)rt.zip 442 -rm -rf dist/vim$(VERSION)rt.zip
449 cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT) 443 cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT)
450 444
451 # Split in two parts to avoid an "argument list too long" error. 445 # Split in two parts to avoid an "argument list too long" error.
452 # We no longer convert the files from unix to dos fileformat. 446 # We no longer convert the files from unix to dos fileformat.
453 dosrt_files: dist prepare no_title.vim 447 dosrt_files: dist prepare
454 -rm -rf dist/vim 448 -rm -rf dist/vim
455 mkdir dist/vim 449 mkdir dist/vim
456 mkdir dist/vim/$(VIMRTDIR) 450 mkdir dist/vim/$(VIMRTDIR)
457 mkdir dist/vim/$(VIMRTDIR)/lang 451 mkdir dist/vim/$(VIMRTDIR)/lang
458 cd src && MAKEMO=yes $(MAKE) languages 452 cd src && MAKEMO=yes $(MAKE) languages
504 498
505 dosbin: prepare dosbin_gvim dosbin_w32 dosbin_ole $(DOSBIN_S) 499 dosbin: prepare dosbin_gvim dosbin_w32 dosbin_ole $(DOSBIN_S)
506 -rm $(IN_README_DIR) 500 -rm $(IN_README_DIR)
507 501
508 # make Win32 gvim 502 # make Win32 gvim
509 dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM) 503 dosbin_gvim: dist dist/$(COMMENT_GVIM)
510 -rm -rf dist/gvim$(VERSION).zip 504 -rm -rf dist/gvim$(VERSION).zip
511 -rm -rf dist/vim 505 -rm -rf dist/vim
512 mkdir dist/vim 506 mkdir dist/vim
513 mkdir dist/vim/$(VIMRTDIR) 507 mkdir dist/vim/$(VIMRTDIR)
514 tar cf - \ 508 tar cf - \
526 cp gvimext64.dll dist/vim/$(VIMRTDIR)/GvimExt64/gvimext.dll 520 cp gvimext64.dll dist/vim/$(VIMRTDIR)/GvimExt64/gvimext.dll
527 cd dist && zip -9 -rD -z gvim$(VERSION).zip vim <$(COMMENT_GVIM) 521 cd dist && zip -9 -rD -z gvim$(VERSION).zip vim <$(COMMENT_GVIM)
528 cp gvim.pdb dist/gvim$(VERSION).pdb 522 cp gvim.pdb dist/gvim$(VERSION).pdb
529 523
530 # make Win32 console 524 # make Win32 console
531 dosbin_w32: dist no_title.vim dist/$(COMMENT_W32) 525 dosbin_w32: dist dist/$(COMMENT_W32)
532 -rm -rf dist/vim$(VERSION)w32.zip 526 -rm -rf dist/vim$(VERSION)w32.zip
533 -rm -rf dist/vim 527 -rm -rf dist/vim
534 mkdir dist/vim 528 mkdir dist/vim
535 mkdir dist/vim/$(VIMRTDIR) 529 mkdir dist/vim/$(VIMRTDIR)
536 tar cf - \ 530 tar cf - \
543 cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe 537 cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
544 cd dist && zip -9 -rD -z vim$(VERSION)w32.zip vim <$(COMMENT_W32) 538 cd dist && zip -9 -rD -z vim$(VERSION)w32.zip vim <$(COMMENT_W32)
545 cp vimw32.pdb dist/vim$(VERSION)w32.pdb 539 cp vimw32.pdb dist/vim$(VERSION)w32.pdb
546 540
547 # make Win32 gvim with OLE 541 # make Win32 gvim with OLE
548 dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE) 542 dosbin_ole: dist dist/$(COMMENT_OLE)
549 -rm -rf dist/gvim$(VERSION)ole.zip 543 -rm -rf dist/gvim$(VERSION)ole.zip
550 -rm -rf dist/vim 544 -rm -rf dist/vim
551 mkdir dist/vim 545 mkdir dist/vim
552 mkdir dist/vim/$(VIMRTDIR) 546 mkdir dist/vim/$(VIMRTDIR)
553 tar cf - \ 547 tar cf - \