From: Daniel Lenski <dlenski@gmail.com>
Date: Thu, 25 Mar 2021 18:31:16 +0000 (-0700)
Subject: NSIS installer: add compression, installer file properties, and docs
X-Git-Tag: v8.20~354
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6a515d77dea5b3ce7fcfac5d36fe2819f083c86c;p=users%2Fdwmw2%2Fopenconnect.git

NSIS installer: add compression, installer file properties, and docs

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 829aced3..8ce68f6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -369,10 +369,16 @@ MinGW32/GnuTLS:
   - make VERBOSE=1 -j4 check XFAIL_TESTS="sigterm dtls-psk"
 # Build NSIS installer
   - SYSROOT=/usr/i686-w64-mingw32/sys-root
+  - VERSION=$(cut -f2 -d\" version.c)
+  - PROD_VERSION=$(echo "$VERSION" | perl -ne 'm|v(\d+)\.(\d+)(?:\-(\d+)-g.+)|; print "$1.$2." . ($3 or "0") . ".0"') # only X.Y.Z.W is allowed
   - make -C www update && mv public docs
   - ln -bs .libs/openconnect.exe .libs/libopenconnect-5.dll $SYSROOT/mingw/{bin,lib}/*.dll .
-  - PATH="$PATH:$PWD" nsiswrapper --name OpenConnect --outfile openconnect-installer.exe $PWD/openconnect.exe > openconnect.nsi
-  - makensis openconnect.nsi
+  - PATH="$PATH:$PWD" nsiswrapper --name OpenConnect --outfile openconnect-installer.exe $PWD/openconnect.exe $PWD/docs > openconnect.nsi
+  - >
+    makensis -X"SetCompressor /FINAL lzma" -X'VIAddVersionKey ProductName "OpenConnect"'
+    -X"VIProductVersion \"$PROD_VERSION\"" -X"VIAddVersionKey ProductVersion \"$VERSION\""
+    -X'VIAddVersionKey Comments "OpenConnect multi-protocol VPN client for Windows (command-line version) built with GnuTLS. For more information, visit https://openconnect.gitlab.io/openconnect"'
+    openconnect.nsi
   tags:
   - shared
   except:
@@ -398,10 +404,16 @@ MinGW32/OpenSSL:
   - make VERBOSE=1 -j4 check XFAIL_TESTS="sigterm dtls-psk"
 # Build NSIS installer
   - SYSROOT=/usr/i686-w64-mingw32/sys-root
+  - VERSION=$(cut -f2 -d\" version.c)
+  - PROD_VERSION=$(echo "$VERSION" | perl -ne 'm|v(\d+)\.(\d+)(?:\-(\d+)-g.+)|; print "$1.$2." . ($3 or "0") . ".0"') # only X.Y.Z.W is allowed
   - make -C www update && mv public docs
   - ln -bs .libs/openconnect.exe .libs/libopenconnect-5.dll $SYSROOT/mingw/{bin,lib}/*.dll .
-  - PATH="$PATH:$PWD" nsiswrapper --name OpenConnect --outfile openconnect-installer.exe $PWD/openconnect.exe > openconnect.nsi
-  - makensis openconnect.nsi
+  - PATH="$PATH:$PWD" nsiswrapper --name OpenConnect --outfile openconnect-installer.exe $PWD/openconnect.exe $PWD/docs > openconnect.nsi
+  - >
+    makensis -X"SetCompressor /FINAL lzma" -X'VIAddVersionKey ProductName "OpenConnect"'
+    -X"VIProductVersion \"$PROD_VERSION\"" -X"VIAddVersionKey ProductVersion \"$VERSION\""
+    -X'VIAddVersionKey Comments "OpenConnect multi-protocol VPN client for Windows (command-line version) built with OpenSSL. For more information, visit https://openconnect.gitlab.io/openconnect"'
+    openconnect.nsi
   tags:
   - shared
   except: