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.
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 7c8d4ba..0bc9d4c 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 @@
!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 @@
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