comparison Makefile @ 7613:4456fa2d22e8 v7.4.1106

commit https://github.com/vim/vim/commit/286eacd3f6631e985089176fb1dff1bcf1a1d6b5 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 16 18:05:50 2016 +0100 patch 7.4.1106 Problem: The nsis script can't be used from the appveyor build. Solution: Add "ifndef" to allow for variables to be set from the command line. Remove duplicate SetCompressor command. Support using other gettext binaries. (Ken Takata) Update build instructions to use libintl-8.dll.
author Christian Brabandt <cb@256bit.org>
date Sat, 16 Jan 2016 18:15:05 +0100
parents 357b7bd8d612
children 58e749232bd7
comparison
equal deleted inserted replaced
7612:68c8b377f278 7613:4456fa2d22e8
129 # flag). 129 # flag).
130 # - "make amirt", "make amibin". 130 # - "make amirt", "make amibin".
131 # 131 #
132 # MS-Windows: 132 # MS-Windows:
133 # - Run make on Unix to update the ".mo" files. 133 # - Run make on Unix to update the ".mo" files.
134 # - Get libintl-8.dll and libiconv-2.dll. E.g. from
135 # https://mlocati.github.io/gettext-iconv-windows/ .
136 # Put them in the top directory, "make dosrt" uses them.
134 # - > make dossrc 137 # - > make dossrc
135 # > make dosrt 138 # > make dosrt
136 # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC. 139 # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
137 # Win32 console version build: 140 # Win32 console version build:
138 # - Set environment for Visual C++ 2008, e.g.: 141 # - Set environment for Visual C++ 2008, e.g.:
491 mkdir dist/vim/$(VIMRTDIR)/lang/$$n; \ 494 mkdir dist/vim/$(VIMRTDIR)/lang/$$n; \
492 mkdir dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES; \ 495 mkdir dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES; \
493 cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \ 496 cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \
494 fi \ 497 fi \
495 done 498 done
496 cp libintl.dll dist/vim/$(VIMRTDIR)/ 499 cp libintl-8.dll dist/vim/$(VIMRTDIR)/
500 cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
497 501
498 502
499 # Used before uploading. Don't delete the AAPDIR/sign files! 503 # Used before uploading. Don't delete the AAPDIR/sign files!
500 runtime_unix2dos: dosrt_files 504 runtime_unix2dos: dosrt_files
501 -rm -rf `find runtime/dos -type f -print | sed -e /AAPDIR/d` 505 -rm -rf `find runtime/dos -type f -print | sed -e /AAPDIR/d`