Mercurial > vim

comparison nsis/gvim.nsi @ 7613:4456fa2d22e8 v7.4.1106

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c473a9393dc5
comparison
equal deleted inserted replaced
7612:68c8b377f278 7613:4456fa2d22e8
4 4
5 # WARNING: if you make changes to this script, look out for $0 to be valid, 5 # WARNING: if you make changes to this script, look out for $0 to be valid,
6 # because uninstall deletes most files in $0. 6 # because uninstall deletes most files in $0.
7 7
8 # Location of gvim_ole.exe, vimw32.exe, GvimExt/*, etc. 8 # Location of gvim_ole.exe, vimw32.exe, GvimExt/*, etc.
9 !define VIMSRC "..\src" 9 !ifndef VIMSRC
10 !define VIMSRC "..\src"
11 !endif
10 12
11 # Location of runtime files 13 # Location of runtime files
12 !define VIMRT ".." 14 !ifndef VIMRT
15 !define VIMRT ".."
16 !endif
13 17
14 # Location of extra tools: diff.exe 18 # Location of extra tools: diff.exe
15 !define VIMTOOLS ..\.. 19 !ifndef VIMTOOLS
20 !define VIMTOOLS ..\..
21 !endif
16 22
17 # Comment the next line if you don't have UPX. 23 # Comment the next line if you don't have UPX.
18 # Get it at http://upx.sourceforge.net 24 # Get it at http://upx.sourceforge.net
19 !define HAVE_UPX 25 !define HAVE_UPX
20 26
30 !include x64.nsh 36 !include x64.nsh
31 37
32 Name "Vim ${VER_MAJOR}.${VER_MINOR}" 38 Name "Vim ${VER_MAJOR}.${VER_MINOR}"
33 OutFile gvim${VER_MAJOR}${VER_MINOR}.exe 39 OutFile gvim${VER_MAJOR}${VER_MINOR}.exe
34 CRCCheck force 40 CRCCheck force
35 SetCompressor lzma 41 SetCompressor /SOLID lzma
36 SetDatablockOptimize on 42 SetDatablockOptimize on
37 RequestExecutionLevel highest 43 RequestExecutionLevel highest
44 XPStyle on
38 45
39 ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer." 46 ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer."
40 DirText "Choose a directory to install Vim (should contain 'vim')" 47 DirText "Choose a directory to install Vim (should contain 'vim')"
41 Icon icons\vim_16c.ico 48 Icon icons\vim_16c.ico
42 # NSIS2 uses a different strategy with six different images in a strip... 49 # NSIS2 uses a different strategy with six different images in a strip...
52 LicenseData ${VIMRT}\doc\uganda.nsis.txt 59 LicenseData ${VIMRT}\doc\uganda.nsis.txt
53 60
54 !ifdef HAVE_UPX 61 !ifdef HAVE_UPX
55 !packhdr temp.dat "upx --best --compress-icons=1 temp.dat" 62 !packhdr temp.dat "upx --best --compress-icons=1 temp.dat"
56 !endif 63 !endif
57
58 SetCompressor /SOLID lzma
59 XPStyle on
60 64
61 # This adds '\vim' to the user choice automagically. The actual value is 65 # This adds '\vim' to the user choice automagically. The actual value is
62 # obtained below with ReadINIStr. 66 # obtained below with ReadINIStr.
63 InstallDir "$PROGRAMFILES\Vim" 67 InstallDir "$PROGRAMFILES\Vim"
64 68
353 File /r ${VIMRT}\lang\*.* 357 File /r ${VIMRT}\lang\*.*
354 SetOutPath $0\keymap 358 SetOutPath $0\keymap
355 File ${VIMRT}\keymap\README.txt 359 File ${VIMRT}\keymap\README.txt
356 File ${VIMRT}\keymap\*.vim 360 File ${VIMRT}\keymap\*.vim
357 SetOutPath $0 361 SetOutPath $0
358 File ${VIMRT}\libintl.dll 362 File ${VIMRT}\libintl-8.dll
363 File ${VIMRT}\libiconv-2.dll
364 File /nonfatal ${VIMRT}\libwinpthread-1.dll
359 SectionEnd 365 SectionEnd
360 !endif 366 !endif
361 367
362 ########################################################## 368 ##########################################################
363 Section -call_install_exe 369 Section -call_install_exe