From 3a7670507a76c0f66d5aeb14ae6434bbd3bcc285 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 3 Dec 2020 14:02:43 +0000 Subject: [PATCH] Windows installer path fixes. --- installer/mosquitto.nsi | 16 +++++++--------- installer/mosquitto64.nsi | 16 +++++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi index 6f0f8288..59719a29 100644 --- a/installer/mosquitto.nsi +++ b/installer/mosquitto.nsi @@ -42,27 +42,26 @@ Section "Files" SecInstall SectionIn RO SetOutPath "$INSTDIR" File "..\build\src\Release\mosquitto.exe" - File "..\build\src\Release\mosquitto_passwd.exe" - File "..\build\apps\mosquitto_ctrl\mosquitto_ctrl.exe" + File "..\build\apps\mosquitto_passwd\Release\mosquitto_passwd.exe" + File "..\build\apps\mosquitto_ctrl\Release\mosquitto_ctrl.exe" File "..\build\client\Release\mosquitto_pub.exe" File "..\build\client\Release\mosquitto_sub.exe" File "..\build\client\Release\mosquitto_rr.exe" File "..\build\lib\Release\mosquitto.dll" File "..\build\lib\cpp\Release\mosquittopp.dll" - File "..\build\plugins\dynamic-security\mosquitto_dynamic_security.dll" - File "..\libcjson.dll" + File "..\build\plugins\dynamic-security\Release\mosquitto_dynamic_security.dll" File "..\aclfile.example" File "..\ChangeLog.txt" File "..\mosquitto.conf" File "..\pwfile.example" File "..\README.md" File "..\README-windows.txt" - File "..\README-letsencrypt.txt" + File "..\README-letsencrypt.md" ;File "C:\pthreads\Pre-built.2\dll\x86\pthreadVC2.dll" File "C:\OpenSSL-Win32\bin\libssl-1_1.dll" File "C:\OpenSSL-Win32\bin\libcrypto-1_1.dll" File "..\edl-v10" - File "..\epl-v10" + File "..\epl-v20" SetOutPath "$INSTDIR\devel" File "..\build\lib\Release\mosquitto.lib" @@ -108,13 +107,12 @@ Section "Uninstall" Delete "$INSTDIR\pwfile.example" Delete "$INSTDIR\README.txt" Delete "$INSTDIR\README-windows.txt" - Delete "$INSTDIR\README-letsencrypt.txt" + Delete "$INSTDIR\README-letsencrypt.md" ;Delete "$INSTDIR\pthreadVC2.dll" - Delete "$INSTDIR\libcjson.dll" Delete "$INSTDIR\libssl-1_1.dll" Delete "$INSTDIR\libcrypto-1_1.dll" Delete "$INSTDIR\edl-v10" - Delete "$INSTDIR\epl-v10" + Delete "$INSTDIR\epl-v20" Delete "$INSTDIR\devel\mosquitto.h" Delete "$INSTDIR\devel\mosquitto.lib" diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi index 996c018e..6ae77a47 100644 --- a/installer/mosquitto64.nsi +++ b/installer/mosquitto64.nsi @@ -43,27 +43,26 @@ Section "Files" SecInstall SectionIn RO SetOutPath "$INSTDIR" File "..\build64\src\Release\mosquitto.exe" - File "..\build64\src\Release\mosquitto_passwd.exe" - File "..\build64\apps\mosquitto_ctrl\mosquitto_ctrl.exe" + File "..\build64\apps\mosquitto_ctrl\Release\mosquitto_ctrl.exe" + File "..\build64\apps\mosquitto_passwd\Release\mosquitto_passwd.exe" File "..\build64\client\Release\mosquitto_pub.exe" File "..\build64\client\Release\mosquitto_sub.exe" File "..\build64\client\Release\mosquitto_rr.exe" File "..\build64\lib\Release\mosquitto.dll" File "..\build64\lib\cpp\Release\mosquittopp.dll" - File "..\build64\plugins\dynamic-security\mosquitto_dynamic_security.dll" - File "..\libcjson.dll" + File "..\build64\plugins\dynamic-security\Release\mosquitto_dynamic_security.dll" File "..\aclfile.example" File "..\ChangeLog.txt" File "..\mosquitto.conf" File "..\pwfile.example" File "..\README.md" File "..\README-windows.txt" - File "..\README-letsencrypt.txt" + File "..\README-letsencrypt.md" ;File "C:\pthreads\Pre-built.2\dll\x64\pthreadVC2.dll" File "C:\OpenSSL-Win64\bin\libssl-1_1-x64.dll" File "C:\OpenSSL-Win64\bin\libcrypto-1_1-x64.dll" File "..\edl-v10" - File "..\epl-v10" + File "..\epl-v20" SetOutPath "$INSTDIR\devel" File "..\build64\lib\Release\mosquitto.lib" @@ -109,13 +108,12 @@ Section "Uninstall" Delete "$INSTDIR\pwfile.example" Delete "$INSTDIR\README.txt" Delete "$INSTDIR\README-windows.txt" - Delete "$INSTDIR\README-letsencrypt.txt" + Delete "$INSTDIR\README-letsencrypt.md" ;Delete "$INSTDIR\pthreadVC2.dll" - Delete "$INSTDIR\libcjson.dll" Delete "$INSTDIR\libssl-1_1-x64.dll" Delete "$INSTDIR\libcrypto-1_1-x64.dll" Delete "$INSTDIR\edl-v10" - Delete "$INSTDIR\epl-v10" + Delete "$INSTDIR\epl-v20" Delete "$INSTDIR\devel\mosquitto.h" Delete "$INSTDIR\devel\mosquitto.lib"