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

Message ID BL0PR2101MB105861B81A70F8D2827526E4AB540@BL0PR2101MB1058.namprd21.prod.outlook.com
State Superseded
Headers show
Series
  • [Openvpn-devel,openvpn-build] Install/uninstall dialer DLL as part of Windows installer operation
Related show

Commit Message

Rolf Fokkens via Openvpn-devel July 25, 2018, 5:01 p.m.
From 30e851ffafcc9ad76928d796f9b18144c8d79040 Mon Sep 17 00:00:00 2001
From: Kevin Kane <kkane@microsoft.com>
Date: Fri, 13 Jul 2018 09:47:43 -0700
Subject: Install/uninstall dialer DLL as part of Windows installer operation

Signed-off-by: Kevin Kane <kkane@microsoft.com>
---
windows-nsis/openvpn.nsi | 4 ++++
1 file changed, 4 insertions(+)

--
2.17.1.windows.2
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

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"