From: Kevin Kane Date: Wed, 25 Jul 2018 17:01:38 +0000 Message-ID: Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_BL0PR2101MB105861B81A70F8D2827526E4AB540BL0PR2101MB1058_" MIME-Version: 1.0 Subject: [Openvpn-devel] [PATCH] [openvpn-build] Install/uninstall dialer DLL as part of Windows installer operation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: openvpn-devel --_000_BL0PR2101MB105861B81A70F8D2827526E4AB540BL0PR2101MB1058_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From 30e851ffafcc9ad76928d796f9b18144c8d79040 Mon Sep 17 00:00:00 2001 From: Kevin Kane 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 --- windows-nsis/openvpn.nsi | 4 ++++ 1 file changed, 4 insertions(+) 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 = * +; * 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-gu= i.exe" + File "${OPENVPN_ROOT_X86_64}\bin\libopenvpndi= aler-0.dll" ${Else} File "${OPENVPN_ROOT_I686}\bin\openvpn-gui.= exe" + File "${OPENVPN_ROOT_I686}\bin\libopenvpndial= er-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" -- 2.17.1.windows.2 --_000_BL0PR2101MB105861B81A70F8D2827526E4AB540BL0PR2101MB1058_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

From 30e851ffafcc9ad76928d796f9b18144c8d79040 Mon Se= p 17 00:00:00 2001

From: Kevin Kane <kkane@...2393...>=

Date: Fri, 13 Jul 2018 09:47:43 -0700

Subject: Install/uninstall dialer DLL as part of Win= dows installer operation

Signed-off-by: Kevin Kane <kkane@...2393...>

---

windows-nsis/openvpn.nsi | 4 ++++

1 file changed, 4 insertions(+)

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, In= c. = *

; * Copyright (C) 2012= Alon Bar-Lev <alon.barlev@...277...> &n= bsp; *

+; * Portions Copyright (C) 2018 Microsoft Corpo= ration &nb= sp; *

; * This program is free software; you can red= istribute it and/or modify *

; * it under the terms of the GNU General Publ= ic License version 2 = *

; * as published by the Free Software Foundati= on. = &nb= sp; *

@@ -443,8 +444,10 @@ Section /o "${PACKAGE_= NAME} GUI" SecOpenVPNGUI

&nbs= p; ${If} ${RunningX64}

&nbs= p; &= nbsp; File "${OP= ENVPN_ROOT_X86_64}\bin\openvpn-gui.exe"

+ = ; &n= bsp; File "${OPENVPN_ROOT_X8= 6_64}\bin\libopenvpndialer-0.dll"

&nbs= p; ${Else}

&nbs= p; &= nbsp; File "${OP= ENVPN_ROOT_I686}\bin\openvpn-gui.exe"

+ = ; &n= bsp; File "${OPENVPN_ROOT_I6= 86}\bin\libopenvpndialer-0.dll"

&nbs= p; ${EndIf}

&nbs= p; ${If} ${SectionIsSelected} ${SecAddShortcu= tsWorkaround}

@@ -770,6 +773,7 @@ Section "Uninstall"= ;

&nbs= p; ${EndIf}

&nbs= p; Delete "$INSTDIR\bin\openvpn-gui.exe&= quot;

+ = ; Delete "$INSTDIR\bin\libopenvpndialer-0.dll&= quot;

&nbs= p; Delete "$DESKTOP\${PACKAGE_NAME= } GUI.lnk"

&nbs= p; Delete "$INSTDIR\bin\openvpn.exe"= ;

--

2.17.1.windows.2

--_000_BL0PR2101MB105861B81A70F8D2827526E4AB540BL0PR2101MB1058_--