From: Daniel Lenski <dlenski@gmail.com>
Date: Fri, 26 Mar 2021 18:49:38 +0000 (-0700)
Subject: add link to online documentation, put TAP-Windows in named section, and… changelog
X-Git-Tag: v8.20~345
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=44c8038707c06897588aa75ef02a38793387b86e;p=users%2Fdwmw2%2Fopenconnect.git

add link to online documentation, put TAP-Windows in named section, and… changelog

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

diff --git a/openconnect.nsi.in b/openconnect.nsi.in
index b791cfae..e050eec1 100644
--- a/openconnect.nsi.in
+++ b/openconnect.nsi.in
@@ -49,11 +49,29 @@ Section "OpenConnect"
 
   SetOutPath "$INSTDIR"
   !include instfiles.nsh
+
+  ClearErrors
+  FileOpen $0 "$INSTDIR\Online Documentation.url" w
+  IfErrors done
+    FileWrite $0 "[InternetShortcut]$\n"
+    FileWrite $0 "URL=https://www.infradead.org/openconnect$\n"
+    FileWrite $0 "IconIndex=0$\n"
+    FileWrite $0 "IconFile=$INSTDIR\openconnect.exe$\n"
+    FileClose $0
+  done:
 SectionEnd
 
-Section -prerequisites
-  SectionIn RO
+Section "Start Menu Shortcuts"
+  CreateDirectory "$SMPROGRAMS\OpenConnect"
+  CreateShortCut "$SMPROGRAMS\OpenConnect\Uninstall OpenConnect.lnk" "$INSTDIR\Uninstall OpenConnect.exe" "" "$INSTDIR\Uninstall OpenConnect.exe" 0
+  CreateShortCut "$SMPROGRAMS\OpenConnect\openconnect.exe.lnk" "$INSTDIR\.\openconnect.exe" "" "$INSTDIR\.\openconnect.exe" 0
+SectionEnd
+
+Section "Desktop Icons"
+  CreateShortCut "$DESKTOP\openconnect.exe.lnk" "$INSTDIR\.\openconnect.exe" "" "$INSTDIR\.\openconnect.exe" 0
+SectionEnd
 
+Section "TAP-Windows driver"
   MessageBox MB_OK \
     "OpenConnect uses the TAP-Windows driver from OpenVPN to create virtual Ethernet adapters for \
      VPN connections. If you haven't already installed this driver, you should now install v9.21.2, \
@@ -65,20 +83,9 @@ Section -prerequisites
     DetailPrint "Running TAP-Windows driver setup..."
     ExecWait "$INSTDIR\tap-windows-9.21.2.exe"
     DetailPrint "Finished TAP-Windows driver setup"
-    Delete /rebootok "$INSTDIR\tap-windows-9.21.2.exe"
   endTapWindows:
 SectionEnd
 
-Section "Start Menu Shortcuts"
-  CreateDirectory "$SMPROGRAMS\OpenConnect"
-  CreateShortCut "$SMPROGRAMS\OpenConnect\Uninstall OpenConnect.lnk" "$INSTDIR\Uninstall OpenConnect.exe" "" "$INSTDIR\Uninstall OpenConnect.exe" 0
-  CreateShortCut "$SMPROGRAMS\OpenConnect\openconnect.exe.lnk" "$INSTDIR\.\openconnect.exe" "" "$INSTDIR\.\openconnect.exe" 0
-SectionEnd
-
-Section "Desktop Icons"
-  CreateShortCut "$DESKTOP\openconnect.exe.lnk" "$INSTDIR\.\openconnect.exe" "" "$INSTDIR\.\openconnect.exe" 0
-SectionEnd
-
 Section "Uninstall"
   Delete /rebootok "$DESKTOP\openconnect.exe.lnk"
   Delete /rebootok "$SMPROGRAMS\OpenConnect\openconnect.exe.lnk"
diff --git a/www/changelog.xml b/www/changelog.xml
index 998f4224..5cc97e79 100644
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -31,6 +31,7 @@
        <li>Add detection of authentication expiration date, intended to allow front-ends to cache and reuse authentication cookies/sessions (<a href="https://gitlab.com/openconnect/openconnect/-/merge_requests/156">!156</a>)</li>
        <li>Small bug fixes and clarification of many logging messages.</li>
        <li>Support more Juniper login forms, including some SSO forms (<a href="https://gitlab.com/openconnect/openconnect/-/merge_requests/171">!171</a>)</li>
+       <li>Automatically build Windows installers for OpenConnect command-line interface (<a href="https://gitlab.com/openconnect/openconnect/-/merge_requests/176">!176</a>)</li>
      </ul><br/>
   </li>
   <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz">OpenConnect v8.10</a></b>