Mercurial > vim

comparison Makefile @ 11042:5de2fb612f21 v8.0.0410

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0410: newer gettext/iconv library has extra dll file commit https://github.com/vim/vim/commit/a54d2fc0d3ec7c4c8ca99b91e2ff7f7fee45c8bd Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 4 20:09:34 2017 +0100 patch 8.0.0410: newer gettext/iconv library has extra dll file Problem: Newer gettext/iconv library has extra dll file. Solution: Add the file to the Makefile and nsis script. (Christian Brabandt)
author Christian Brabandt <cb@256bit.org>
date Sat, 04 Mar 2017 20:15:03 +0100
parents 9f48eab77d62
children c6dc5d62cf5e
comparison
equal deleted inserted replaced
11041:02292c3afb7b 11042:5de2fb612f21
118 # flag). 118 # flag).
119 # - "make amirt", "make amibin". 119 # - "make amirt", "make amibin".
120 # 120 #
121 # MS-Windows: 121 # MS-Windows:
122 # - Run make on Unix to update the ".mo" files. 122 # - Run make on Unix to update the ".mo" files.
123 # - Get libintl-8.dll and libiconv-2.dll. E.g. from 123 # - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
124 # https://mlocati.github.io/gettext-iconv-windows/ . 124 # https://mlocati.github.io/gettext-iconv-windows/ .
125 # Use the "shared-32.zip file and extract the archive to get the files.
125 # Put them in the top directory, "make dosrt" uses them. 126 # Put them in the top directory, "make dosrt" uses them.
126 # - > make dossrc 127 # - > make dossrc
127 # > make dosrt 128 # > make dosrt
128 # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC. 129 # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
129 # Win32 console version build: 130 # Win32 console version build:
466 cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \ 467 cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \
467 fi \ 468 fi \
468 done 469 done
469 cp libintl-8.dll dist/vim/$(VIMRTDIR)/ 470 cp libintl-8.dll dist/vim/$(VIMRTDIR)/
470 cp libiconv-2.dll dist/vim/$(VIMRTDIR)/ 471 cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
472 cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/
471 473
472 474
473 # Used before uploading. Don't delete the AAPDIR/sign files! 475 # Used before uploading. Don't delete the AAPDIR/sign files!
474 runtime_unix2dos: dosrt_files 476 runtime_unix2dos: dosrt_files
475 -rm -rf `find runtime/dos -type f -print | sed -e /AAPDIR/d` 477 -rm -rf `find runtime/dos -type f -print | sed -e /AAPDIR/d`