Added OpenVPN GUI (Mathias Sundman version) as install

option in Windows installer.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1863 e7ae566f-a301-0410-adde-c780ea21d3b5

2 files changed, 36 insertions, 2 deletions

diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index fc059df..f7cda11 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -95,6 +95,10 @@
 
   LangString DESC_SecOpenVPNUserSpace ${LANG_ENGLISH} "Install OpenVPN user-space components, including openvpn.exe."
 
+!ifdef OPENVPN_GUI
+  LangString DESC_SecOpenVPNGUI ${LANG_ENGLISH} "Install OpenVPN GUI by Mathias Sundman"
+!endif
+
   LangString DESC_SecOpenVPNEasyRSA ${LANG_ENGLISH} "Install OpenVPN RSA scripts for X509 certificate management."
 
   LangString DESC_SecOpenSSLDLLs ${LANG_ENGLISH} "Install OpenSSL DLLs locally (may be omitted if DLLs are already installed globally)."
@@ -223,6 +227,17 @@ Section "OpenVPN User-Space Components" SecOpenVPNUserSpace
 
 SectionEnd
 
+!ifdef OPENVPN_GUI
+Section "OpenVPN GUI" SecOpenVPNGUI
+
+  SetOverwrite on
+  SetOutPath "$INSTDIR\bin"
+
+  File "${HOME}\${OPENVPN_GUI_DIR}\${OPENVPN_GUI}"
+
+SectionEnd
+!endif
+
 Section "OpenVPN RSA Certificate Management Scripts" SecOpenVPNEasyRSA
 
   SetOverwrite on
@@ -481,8 +496,16 @@ Section -post
     !insertmacro WriteRegStringIfUndef HKCR "OpenVPNFile\shell\run" "" "Start OpenVPN on this config file"
     !insertmacro WriteRegStringIfUndef HKCR "OpenVPNFile\shell\run\command" "" '"$INSTDIR\bin\openvpn.exe" --pause-exit --config "%1"'
 
-    ; Create start menu shortcuts to addtap.bat and deltapall.bat
+    ; Create start menu and desktop shortcuts to OpenVPN GUI
  noass:
+  !ifdef OPENVPN_GUI
+    IfFileExists "$INSTDIR\bin\${OPENVPN_GUI}" "" tryaddtap
+      CreateShortCut "$SMPROGRAMS\OpenVPN\OpenVPN GUI.lnk" "$INSTDIR\bin\${OPENVPN_GUI}" ""
+      CreateShortcut "$DESKTOP\OpenVPN GUI.lnk" "$INSTDIR\bin\${OPENVPN_GUI}"
+  !endif
+
+    ; Create start menu shortcuts to addtap.bat and deltapall.bat
+ tryaddtap:
     IfFileExists "$INSTDIR\bin\addtap.bat" "" trydeltap
       CreateShortCut "$SMPROGRAMS\OpenVPN\Add a new TAP-Win32 virtual ethernet adapter.lnk" "$INSTDIR\bin\addtap.bat" ""
 
@@ -528,6 +551,9 @@ SectionEnd
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenVPNUserSpace} $(DESC_SecOpenVPNUserSpace)
+  !ifdef OPENVPN_GUI
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenVPNGUI} $(DESC_SecOpenVPNGUI)
+  !endif
   !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenVPNEasyRSA} $(DESC_SecOpenVPNEasyRSA)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTAP} $(DESC_SecTAP)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenSSLUtilities} $(DESC_SecOpenSSLUtilities)
@@ -573,6 +599,9 @@ Section "Uninstall"
   RMDir /r $SMPROGRAMS\OpenVPN
 
   Delete "$INSTDIR\bin\openvpn.exe"
+  !ifdef OPENVPN_GUI
+    Delete "$INSTDIR\bin\${OPENVPN_GUI}"
+  !endif
   Delete "$INSTDIR\bin\openvpnserv.exe"
   Delete "$INSTDIR\bin\libeay32.dll"
   Delete "$INSTDIR\bin\libssl32.dll"
diff --git a/install-win32/version.nsi b/install-win32/version.nsi
index f399cb5..7fbaf0b 100644
--- a/install-win32/version.nsi
+++ b/install-win32/version.nsi
@@ -1,7 +1,12 @@
 # Version numbers, settings, and dependencies
 # for Windows OpenVPN installer.
 
-!define PRODUCT_VERSION "2.1_rc2e"
+!define PRODUCT_VERSION "2.1_rc2f"
+
+# Include the OpenVPN GUI exe in the installer.
+# May be undefined.
+!define OPENVPN_GUI_DIR "../openvpn-gui"
+!define OPENVPN_GUI     "openvpn-gui-1.0.3.exe"
 
 # For now, use prebuilt AMD64 tap/tapinstall
 #!define TAP_BIN_AMD64 "../amd64/tap/tap0901.sys"