github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Windows workflow name and update installer

Browse Source
pull/2619/merge
Roger A. Light 3 years ago
parent 8d38c91f4c
commit dfa9a22d64
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
.github/workflows/windows.yml vendored
Unescape Escape View File

@ -1,4 +1,4 @@
name: CMake
name: Windows build
on:
workflow_dispatch:

13
installer/mosquitto.nsi
Unescape Escape View File

@ -52,6 +52,7 @@ Section "Files" SecInstall
File "..\build\lib\Release\mosquitto.dll"
File "..\build\lib\cpp\Release\mosquittopp.dll"
File "..\build\plugins\dynamic-security\Release\mosquitto_dynamic_security.dll"
File "..\build\plugins\persist-sqlite\Release\mosquitto_persist_sqlite.dll"
File "..\aclfile.example"
File "..\ChangeLog.txt"
File "..\mosquitto.conf"
@ -61,8 +62,8 @@ Section "Files" SecInstall
File "..\README-windows.txt"
File "..\README-letsencrypt.md"
File "..\SECURITY.md"
File "C:\OpenSSL-Win32\bin\libssl-3.dll"
File "C:\OpenSSL-Win32\bin\libcrypto-3.dll"
File "C:\OpenSSL-Win32\bin\libssl-1_1.dll"
File "C:\OpenSSL-Win32\bin\libcrypto-1_1.dll"
File "..\edl-v10"
File "..\epl-v20"
@ -72,8 +73,8 @@ Section "Files" SecInstall
File "..\include\mosquitto.h"
File "..\include\mosquitto_broker.h"
File "..\include\mosquitto_plugin.h"
File "..\include\mosquittopp.h"
File "..\include\mqtt_protocol.h"
File "..\lib\cpp\mosquittopp.h"
WriteUninstaller "$INSTDIR\Uninstall.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mosquitto" "DisplayName" "Eclipse Mosquitto MQTT broker"
@ -111,6 +112,7 @@ Section "Uninstall"
Delete "$INSTDIR\mosquitto.dll"
Delete "$INSTDIR\mosquittopp.dll"
Delete "$INSTDIR\mosquitto_dynamic_security.dll"
Delete "$INSTDIR\mosquitto_persist_sqlite.dll"
Delete "$INSTDIR\aclfile.example"
Delete "$INSTDIR\ChangeLog.txt"
Delete "$INSTDIR\mosquitto.conf"
@ -120,8 +122,8 @@ Section "Uninstall"
Delete "$INSTDIR\README-windows.txt"
Delete "$INSTDIR\README-letsencrypt.md"
Delete "$INSTDIR\SECURITY.md"
Delete "$INSTDIR\libssl-3.dll"
Delete "$INSTDIR\libcrypto-3.dll"
Delete "$INSTDIR\libssl-1_1.dll"
Delete "$INSTDIR\libcrypto-1_1.dll"
Delete "$INSTDIR\edl-v10"
Delete "$INSTDIR\epl-v20"
@ -150,4 +152,3 @@ LangString DESC_SecService ${LANG_ENGLISH} "Install mosquitto as a Windows servi
!insertmacro MUI_DESCRIPTION_TEXT ${SecInstall} $(DESC_SecInstall)
!insertmacro MUI_DESCRIPTION_TEXT ${SecService} $(DESC_SecService)
!insertmacro MUI_FUNCTION_DESCRIPTION_END

13
installer/mosquitto64.nsi
Unescape Escape View File

@ -53,6 +53,7 @@ Section "Files" SecInstall
File "..\build64\lib\Release\mosquitto.dll"
File "..\build64\lib\cpp\Release\mosquittopp.dll"
File "..\build64\plugins\dynamic-security\Release\mosquitto_dynamic_security.dll"
File "..\build64\plugins\persist-sqlite\Release\mosquitto_persist_sqlite.dll"
File "..\aclfile.example"
File "..\ChangeLog.txt"
File "..\mosquitto.conf"
@ -62,8 +63,8 @@ Section "Files" SecInstall
File "..\README-windows.txt"
File "..\README-letsencrypt.md"
File "..\SECURITY.md"
File "C:\OpenSSL-Win64\bin\libssl-3-x64.dll"
File "C:\OpenSSL-Win64\bin\libcrypto-3-x64.dll"
File "C:\Program Files\OpenSSL-Win64\bin\libssl-1_1-x64.dll"
File "C:\Program Files\OpenSSL-Win64\bin\libcrypto-1_1-x64.dll"
File "..\edl-v10"
File "..\epl-v20"
@ -73,8 +74,8 @@ Section "Files" SecInstall
File "..\include\mosquitto.h"
File "..\include\mosquitto_broker.h"
File "..\include\mosquitto_plugin.h"
File "..\include\mosquittopp.h"
File "..\include\mqtt_protocol.h"
File "..\lib\cpp\mosquittopp.h"
WriteUninstaller "$INSTDIR\Uninstall.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mosquitto64" "DisplayName" "Eclipse Mosquitto MQTT broker (64 bit)"
@ -112,6 +113,7 @@ Section "Uninstall"
Delete "$INSTDIR\mosquitto.dll"
Delete "$INSTDIR\mosquittopp.dll"
Delete "$INSTDIR\mosquitto_dynamic_security.dll"
Delete "$INSTDIR\mosquitto_persist_sqlite.dll"
Delete "$INSTDIR\aclfile.example"
Delete "$INSTDIR\ChangeLog.txt"
Delete "$INSTDIR\mosquitto.conf"
@ -121,8 +123,8 @@ Section "Uninstall"
Delete "$INSTDIR\README-windows.txt"
Delete "$INSTDIR\README-letsencrypt.md"
Delete "$INSTDIR\SECURITY.md"
Delete "$INSTDIR\libssl-3-x64.dll"
Delete "$INSTDIR\libcrypto-3-x64.dll"
Delete "$INSTDIR\libssl-1_1-x64.dll"
Delete "$INSTDIR\libcrypto-1_1-x64.dll"
Delete "$INSTDIR\edl-v10"
Delete "$INSTDIR\epl-v20"
@ -151,4 +153,3 @@ LangString DESC_SecService ${LANG_ENGLISH} "Install mosquitto as a Windows servi
!insertmacro MUI_DESCRIPTION_TEXT ${SecInstall} $(DESC_SecInstall)
!insertmacro MUI_DESCRIPTION_TEXT ${SecService} $(DESC_SecService)
!insertmacro MUI_FUNCTION_DESCRIPTION_END

Write Preview
Loading…
Cancel
Save