[Openvpn-devel,v2,openvpn-build] Install/uninstall dialer DLL as part of Windows installer operation

Message ID 20180725195040.27560-1-kkane@microsoft.com
State Deferred
Headers show
Series
  • [Openvpn-devel,v2,openvpn-build] Install/uninstall dialer DLL as part of Windows installer operation
Related show

Commit Message

tincantech via Openvpn-devel July 25, 2018, 7:51 p.m.
Signed-off-by: Kevin Kane <kkane@microsoft.com>
---
 windows-nsis/openvpn.nsi | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Gert Doering June 10, 2020, 1:02 p.m. | #1
Hi,

On Wed, Jul 25, 2018 at 07:51:03PM +0000, Kevin Kane via Openvpn-devel wrote:
> Signed-off-by: Kevin Kane <kkane@microsoft.com>
> ---
>  windows-nsis/openvpn.nsi | 4 ++++
>  1 file changed, 4 insertions(+)

I'm trying to clean up "dangling" OpenVPN stuff while in the run-down to
2.5 code freeze.

Came across your patchset to make OpenVPN a proper "dial-on demand" VPN
(if I remember right).

Was this ever finished into something mergeable?

gert

Patch

diff --git a/windows-nsis/openvpn.nsi b/windows-nsis/openvpn.nsi
index e92904d..aff7cb3 100755
--- a/windows-nsis/openvpn.nsi
+++ b/windows-nsis/openvpn.nsi
@@ -1,6 +1,7 @@ 
 ; ****************************************************************************
 ; * Copyright (C) 2002-2010 OpenVPN Technologies, Inc.                       *
 ; * Copyright (C)      2012 Alon Bar-Lev <alon.barlev@gmail.com>             *
+; * Portions Copyright (C) 2018 Microsoft Corporation                        *
 ; *  This program is free software; you can redistribute it and/or modify    *
 ; *  it under the terms of the GNU General Public License version 2          *
 ; *  as published by the Free Software Foundation.                           *
@@ -443,8 +444,10 @@  Section /o "${PACKAGE_NAME} GUI" SecOpenVPNGUI
 
 	${If} ${RunningX64}
 		File "${OPENVPN_ROOT_X86_64}\bin\openvpn-gui.exe"
+		File "${OPENVPN_ROOT_X86_64}\bin\libopenvpndialer-0.dll"
 	${Else}
 		File "${OPENVPN_ROOT_I686}\bin\openvpn-gui.exe"
+		File "${OPENVPN_ROOT_I686}\bin\libopenvpndialer-0.dll"
 	${EndIf}
 
 	${If} ${SectionIsSelected} ${SecAddShortcutsWorkaround}
@@ -770,6 +773,7 @@  Section "Uninstall"
 	${EndIf}
 
 	Delete "$INSTDIR\bin\openvpn-gui.exe"
+	Delete "$INSTDIR\bin\libopenvpndialer-0.dll"
 	Delete "$DESKTOP\${PACKAGE_NAME} GUI.lnk"
 
 	Delete "$INSTDIR\bin\openvpn.exe"