diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-14 19:05:44 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-14 19:05:44 +0200 |
| commit | 6199d43f4b59a9bb1c87d408c5b33fa19a23ebcd (patch) | |
| tree | 9e3b891db8cf578f455cf15512286e8160eb8326 /Makefile | |
| parent | 2c33d7bb69c4c2c5b0e39b03cc4b0c04cfdfbb0b (diff) | |
| download | vim-git-6199d43f4b59a9bb1c87d408c5b33fa19a23ebcd.tar.gz | |
patch 8.0.1191: MS-Windows: missing 32 and 64 bit files in installerv8.0.1191
Problem: MS-Windows: missing 32 and 64 bit files in installer.
Solution: Include both 32 and 64 bit GvimExt and related dll files. Remove
old Windows code from the installer. (Ken Takata, closes #2144)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 17 insertions, 6 deletions
@@ -120,10 +120,14 @@ MINOR = 0 # # MS-Windows: # - Run make on Unix to update the ".mo" files. -# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from +# - Get 32 bit libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from # https://mlocati.github.io/gettext-iconv-windows/ . # Use the "shared-32.zip file and extract the archive to get the files. -# Put them in the top directory, "make dosrt" uses them. +# Put them in the gettext32 directory, "make dosrt" uses them. +# - Get 64 bit libintl-8.dll and libiconv-2.dll. E.g. from +# https://mlocati.github.io/gettext-iconv-windows/ . +# Use the "shared-64.zip file and extract the archive to get the files. +# Put them in the gettext64 directory, "make dosrt" uses them. # - > make dossrc # > make dosrt # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC. @@ -461,9 +465,13 @@ dosrt_files: dist prepare no_title.vim cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \ fi \ done - cp libintl-8.dll dist/vim/$(VIMRTDIR)/ - cp libiconv-2.dll dist/vim/$(VIMRTDIR)/ - cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/ + mkdir dist/vim/$(VIMRTDIR)/gettext32 + cp gettext32/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext32/ + cp gettext32/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext32/ + cp gettext32/libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/gettext32/ + mkdir dist/vim/$(VIMRTDIR)/gettext64 + cp gettext64/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext64/ + cp gettext64/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext64/ # Used before uploading. Don't delete the AAPDIR/sign files! @@ -490,7 +498,10 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM) cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe - cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll + mkdir dist/vim/$(VIMRTDIR)/GvimExt32 + cp gvimext.dll dist/vim/$(VIMRTDIR)/GvimExt32/gvimext.dll + mkdir dist/vim/$(VIMRTDIR)/GvimExt64 + cp gvimext64.dll dist/vim/$(VIMRTDIR)/GvimExt64/gvimext.dll cd dist && zip -9 -rD -z gvim$(VERSION).zip vim <$(COMMENT_GVIM) cp gvim.pdb dist/gvim$(VERSION).pdb |