[vlc-commits] win32: check NSIS version to be at least 3.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Nov 12 12:35:19 2017 +0100| [c396eaf98c065df03bf578e6f0516497c90ef92c] | committer: Rémi Denis-Courmont

win32: check NSIS version to be at least 3.0

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c396eaf98c065df03bf578e6f0516497c90ef92c
---

 extras/package/win32/package.mak | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index b42c53341d..4e88a9026e 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -155,15 +155,16 @@ package-win32-exe: package-win-strip $(win32_destdir)/NSIS/UAC.dll $(win32_destd
 # Create package
 	if makensis -VERSION >/dev/null 2>&1; then \
 	    MAKENSIS="makensis"; \
-	elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
-	    MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
 	elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \
 	    MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \
-	elif wine --version >/dev/null 2>&1; then \
-	    MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
 	else \
 	    echo 'Error: cannot locate makensis tool'; exit 1; \
 	fi; \
+	MAKENSIS_VERSION=`makensis -VERSION`; echo $${MAKENSIS_VERSION:1:1}; \
+	if [ $${MAKENSIS_VERSION:1:1} -lt 3 ]; then \
+	    echo 'Please update your nsis packager';\
+	    exit 1; \
+	fi
 	eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \
 	eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi"
 	if test -n "$(SIGNATURE)"; then \