Skip to content

Commit f6d51a2

Browse files
ralightralight
committed
Add dashboard to Windows installers
1 parent c2151ec commit f6d51a2

File tree

4 files changed

+98
-2
lines changed

4 files changed

+98
-2
lines changed

‎.github/workflows/windows-x86.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
github-binarycache: true
4040

4141
- name: Configure CMake
42-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWITH_WEBSOCKETS=ON -DWITH_TESTS=OFF -DCMAKE_GENERATOR_PLATFORM=WIN32 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x86-windows -DVCPKG_MANIFEST_MODE=ON
42+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWITH_WEBSOCKETS=ON -DWITH_TESTS=OFF -DCMAKE_GENERATOR_PLATFORM=WIN32 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x86-windows -DVCPKG_MANIFEST_MODE=ON -DWITH_HTTP_API -DHTTP_API_DIR="C:\\Program Files\\Mosquitto\\dashboard\\"
4343
- name: Build
4444
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
4545

‎.github/workflows/windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
github-binarycache: true
4444

4545
- name: Configure CMake
46-
run: cmake -B ${{github.workspace}}/build64 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWITH_WEBSOCKETS=ON -DWITH_TESTS=OFF -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-release -DVCPKG_MANIFEST_MODE=ON
46+
run: cmake -B ${{github.workspace}}/build64 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWITH_WEBSOCKETS=ON -DWITH_TESTS=OFF -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-release -DVCPKG_MANIFEST_MODE=ON -DWITH_HTTP_API -DHTTP_API_DIR="C:\\Program Files\\Mosquitto\\dashboard\\"
4747
- name: Build
4848
run: cmake --build ${{github.workspace}}/build64 --config ${{env.BUILD_TYPE}}
4949

‎installer/mosquitto.nsi‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,29 @@ Section "Files" SecInstall
129129
File "..\include\mosquitto\libmosquittopp.h"
130130
File "..\include\mosquitto\mqtt_protocol.h"
131131

132+
SetOutPath "$INSTDIR\dashboard"
133+
File "..\dashboard\src\assert.js
134+
File "..\dashboard\src\chart.umd.js
135+
File "..\dashboard\src\chartjs-plugin-zoom.min.js
136+
File "..\dashboard\src\consts.js
137+
File "..\dashboard\src\dashboard.js
138+
File "..\dashboard\src\hammer.min.js
139+
File "..\dashboard\src\index.html
140+
File "..\dashboard\src\index.js
141+
File "..\dashboard\src\listeners.html
142+
File "..\dashboard\src\listeners.js
143+
File "..\dashboard\src\queue.js
144+
File "..\dashboard\src\sidebar.js
145+
File "..\dashboard\src\styles.css
146+
File "..\dashboard\src\tailwind
147+
File "..\dashboard\src\tailwind.config.js
148+
File "..\dashboard\src\tailwind\styles.css
149+
File "..\dashboard\src\utils.js
150+
151+
SetOutPath "$INSTDIR\dashboard\media"
152+
File "..\dashboard\src\media\favicon-16x16.png
153+
File "..\dashboard\src\media\favicon-32x32.png
154+
File "..\dashboard\src\media\mosquitto-logo.png
132155

133156
WriteUninstaller "$INSTDIR\Uninstall.exe"
134157
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mosquitto" "DisplayName" "Eclipse Mosquitto MQTT broker (32 bit)"
@@ -241,6 +264,30 @@ Section "Uninstall"
241264
RMDir "$INSTDIR\devel\mosquitto"
242265
RMDir "$INSTDIR\devel"
243266

267+
Delete "$INSTDIR\dashboard\media\favicon-16x16.png"
268+
Delete "$INSTDIR\dashboard\media\favicon-32x32.png"
269+
Delete "$INSTDIR\dashboard\media\mosquitto-logo.png"
270+
RMDir "$INSTDIR\dashboard\media"
271+
272+
Delete "$INSTDIR\dashboard\assert.js
273+
Delete "$INSTDIR\dashboard\chart.umd.js
274+
Delete "$INSTDIR\dashboard\chartjs-plugin-zoom.min.js
275+
Delete "$INSTDIR\dashboard\consts.js
276+
Delete "$INSTDIR\dashboard\dashboard.js
277+
Delete "$INSTDIR\dashboard\hammer.min.js
278+
Delete "$INSTDIR\dashboard\index.html
279+
Delete "$INSTDIR\dashboard\index.js
280+
Delete "$INSTDIR\dashboard\listeners.html
281+
Delete "$INSTDIR\dashboard\listeners.js
282+
Delete "$INSTDIR\dashboard\queue.js
283+
Delete "$INSTDIR\dashboard\sidebar.js
284+
Delete "$INSTDIR\dashboard\styles.css
285+
Delete "$INSTDIR\dashboard\tailwind
286+
Delete "$INSTDIR\dashboard\tailwind.config.js
287+
Delete "$INSTDIR\dashboard\tailwind\styles.css
288+
Delete "$INSTDIR\dashboard\utils.js
289+
RMDir "$INSTDIR\dashboard"
290+
244291
Delete "$INSTDIR\Uninstall.exe"
245292
RMDir "$INSTDIR"
246293
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mosquitto"

‎installer/mosquitto64.nsi‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,30 @@ Section "Files" SecInstall
130130
File "..\include\mosquitto\libmosquittopp.h"
131131
File "..\include\mosquitto\mqtt_protocol.h"
132132

133+
SetOutPath "$INSTDIR\dashboard"
134+
File "..\dashboard\src\assert.js
135+
File "..\dashboard\src\chart.umd.js
136+
File "..\dashboard\src\chartjs-plugin-zoom.min.js
137+
File "..\dashboard\src\consts.js
138+
File "..\dashboard\src\dashboard.js
139+
File "..\dashboard\src\hammer.min.js
140+
File "..\dashboard\src\index.html
141+
File "..\dashboard\src\index.js
142+
File "..\dashboard\src\listeners.html
143+
File "..\dashboard\src\listeners.js
144+
File "..\dashboard\src\queue.js
145+
File "..\dashboard\src\sidebar.js
146+
File "..\dashboard\src\styles.css
147+
File "..\dashboard\src\tailwind
148+
File "..\dashboard\src\tailwind.config.js
149+
File "..\dashboard\src\tailwind\styles.css
150+
File "..\dashboard\src\utils.js
151+
152+
SetOutPath "$INSTDIR\dashboard\media"
153+
File "..\dashboard\src\media\favicon-16x16.png
154+
File "..\dashboard\src\media\favicon-32x32.png
155+
File "..\dashboard\src\media\mosquitto-logo.png
156+
133157
WriteUninstaller "$INSTDIR\Uninstall.exe"
134158
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mosquitto64" "DisplayName" "Eclipse Mosquitto MQTT broker (64 bit)"
135159
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mosquitto64" "DisplayIcon" "$INSTDIR\mosquitto.ico"
@@ -241,6 +265,30 @@ Section "Uninstall"
241265
RMDir "$INSTDIR\devel\mosquitto"
242266
RMDir "$INSTDIR\devel"
243267

268+
Delete "$INSTDIR\dashboard\media\favicon-16x16.png"
269+
Delete "$INSTDIR\dashboard\media\favicon-32x32.png"
270+
Delete "$INSTDIR\dashboard\media\mosquitto-logo.png"
271+
RMDir "$INSTDIR\dashboard\media"
272+
273+
Delete "$INSTDIR\dashboard\assert.js
274+
Delete "$INSTDIR\dashboard\chart.umd.js
275+
Delete "$INSTDIR\dashboard\chartjs-plugin-zoom.min.js
276+
Delete "$INSTDIR\dashboard\consts.js
277+
Delete "$INSTDIR\dashboard\dashboard.js
278+
Delete "$INSTDIR\dashboard\hammer.min.js
279+
Delete "$INSTDIR\dashboard\index.html
280+
Delete "$INSTDIR\dashboard\index.js
281+
Delete "$INSTDIR\dashboard\listeners.html
282+
Delete "$INSTDIR\dashboard\listeners.js
283+
Delete "$INSTDIR\dashboard\queue.js
284+
Delete "$INSTDIR\dashboard\sidebar.js
285+
Delete "$INSTDIR\dashboard\styles.css
286+
Delete "$INSTDIR\dashboard\tailwind
287+
Delete "$INSTDIR\dashboard\tailwind.config.js
288+
Delete "$INSTDIR\dashboard\tailwind\styles.css
289+
Delete "$INSTDIR\dashboard\utils.js
290+
RMDir "$INSTDIR\dashboard"
291+
244292
Delete "$INSTDIR\Uninstall.exe"
245293
RMDir "$INSTDIR"
246294
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mosquitto64"
@@ -256,3 +304,4 @@ LangString DESC_SecService ${LANG_ENGLISH} "Install mosquitto as a Windows servi
256304
!insertmacro MUI_DESCRIPTION_TEXT ${SecInstall} $(DESC_SecInstall)
257305
!insertmacro MUI_DESCRIPTION_TEXT ${SecService} $(DESC_SecService)
258306
!insertmacro MUI_FUNCTION_DESCRIPTION_END
307+

0 commit comments

Comments
 (0)