diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-16 18:05:50 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-16 18:05:50 +0100 |
| commit | 286eacd3f6631e985089176fb1dff1bcf1a1d6b5 (patch) | |
| tree | 83ec0d2a894f0d35985906dc1c3e04de10a3c9d4 /nsis | |
| parent | 9bbf63dbf8286fadc0cd6b3428010abb67b1b64d (diff) | |
patch 7.4.1106v7.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.
Diffstat (limited to 'nsis')
| -rw-r--r-- | nsis/gvim.nsi | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 7c8d4ba878..0bc9d4c6a6 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -6,13 +6,19 @@ # because uninstall deletes most files in $0. # Location of gvim_ole.exe, vimw32.exe, GvimExt/*, etc. -!define VIMSRC "..\src" +!ifndef VIMSRC + !define VIMSRC "..\src" +!endif # Location of runtime files -!define VIMRT ".." +!ifndef VIMRT + !define VIMRT ".." +!endif # Location of extra tools: diff.exe -!define VIMTOOLS ..\.. +!ifndef VIMTOOLS + !define VIMTOOLS ..\.. +!endif # Comment the next line if you don't have UPX. # Get it at http://upx.sourceforge.net @@ -32,9 +38,10 @@ Name "Vim ${VER_MAJOR}.${VER_MINOR}" OutFile gvim${VER_MAJOR}${VER_MINOR}.exe CRCCheck force -SetCompressor lzma +SetCompressor /SOLID lzma SetDatablockOptimize on RequestExecutionLevel highest +XPStyle on ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer." DirText "Choose a directory to install Vim (should contain 'vim')" @@ -55,9 +62,6 @@ LicenseData ${VIMRT}\doc\uganda.nsis.txt !packhdr temp.dat "upx --best --compress-icons=1 temp.dat" !endif -SetCompressor /SOLID lzma -XPStyle on - # This adds '\vim' to the user choice automagically. The actual value is # obtained below with ReadINIStr. InstallDir "$PROGRAMFILES\Vim" @@ -355,7 +359,9 @@ SectionEnd File ${VIMRT}\keymap\README.txt File ${VIMRT}\keymap\*.vim SetOutPath $0 - File ${VIMRT}\libintl.dll + File ${VIMRT}\libintl-8.dll + File ${VIMRT}\libiconv-2.dll + File /nonfatal ${VIMRT}\libwinpthread-1.dll SectionEnd !endif |