Snap removed as it has its own repo

NSIS replaced by INNO Setup
Workflow adapted, as DX9 Grabber is no longer included

Author: Paulchen-Panther

.github/workflows/qt5_6.yml

@@ -192,20 +192,6 @@ jobs:
         shell: bash
         run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version
 
-      - name: 💾 Restore DirectX SDK (x64)
-        if: matrix.architecture == 'x64'
-        uses: ethanjli/[email protected]
-        with:
-          url: https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
-          destination: .\installer\dxsdk-jun10.exe
-          cache-key: dxsdk-jun10
-
-      - name: 📥 Extract DirectX SDK (x64)
-        if: matrix.architecture == 'x64'
-        run: |
-          7z x -aoa .\installer\dxsdk-jun10.exe DXSDK/Include DXSDK/Lib -oC:\
-          echo "DXSDK_DIR=C:\DXSDK" | Out-File -FilePath $env:GITHUB_ENV -Append
-
       - name: 📥 Install Qt
         # If the following PR is merged, you can switch back to jurplel/install-qt-action
         # https://github.com/jurplel/install-qt-action/pull/273

cmake/Packaging.cmake

@@ -10,7 +10,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	set(CPACK_GENERATOR "TGZ")
 elseif(WIN32)
-	set(CPACK_GENERATOR "ZIP" "NSIS")
+	set(CPACK_GENERATOR "ZIP" "External")
 	# Overwrite CMAKE_SYSTEM_PROCESSOR for Windows (visual)
 	if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
 		set(CMAKE_SYSTEM_PROCESSOR "x64")
@@ -52,8 +52,9 @@ endif()
 string(REPLACE "+" "." HYPERION_PACKAGE_VERSION ${HYPERION_VERSION})
 set(CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 
-set(CPACK_PACKAGE_CONTACT "packages@hyperion-project.org")
+set(CPACK_PACKAGE_CONTACT "admin@hyperion-project.org")
 set(CPACK_PACKAGE_VENDOR "hyperion-project")
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://hyperion-project.org")
 set(CPACK_PACKAGE_EXECUTABLES "hyperiond;Hyperion")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Hyperion")
 set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/icons/hyperion-32px.png")
@@ -104,42 +105,10 @@ if(CPACK_GENERATOR MATCHES "DragNDrop")
 endif()
 
 # NSIS (Windows only)
-# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cpack/PackageGenerators#nsis
 if(WIN32)
-	# Use custom script based on cpack nsis template
-	set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/nsis/template ${CMAKE_MODULE_PATH})
-
-	# Some path transformations
-	file(TO_NATIVE_PATH ${CPACK_PACKAGE_ICON} CPACK_PACKAGE_ICON)
-	string(REGEX REPLACE "\\\\" "\\\\\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
-
-	file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/cmake/windows/nsis/installer.ico" NSIS_HYP_ICO)
-	file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/cmake/windows/nsis/header.bmp" NSIS_HYP_LOGO_HORI)
-	file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/cmake/windows/nsis/logo.bmp" NSIS_HYP_LOGO_VERT)
-
-	string(REGEX REPLACE "\\\\" "\\\\\\\\" NSIS_HYP_ICO "${NSIS_HYP_ICO}")
-	string(REGEX REPLACE "\\\\" "\\\\\\\\" NSIS_HYP_LOGO_VERT "${NSIS_HYP_LOGO_VERT}")
-	string(REGEX REPLACE "\\\\" "\\\\\\\\" NSIS_HYP_LOGO_HORI "${NSIS_HYP_LOGO_HORI}")
-
-	set(CPACK_NSIS_MODIFY_PATH ON)
-	set(CPACK_NSIS_MUI_ICON ${NSIS_HYP_ICO})
-	set(CPACK_NSIS_MUI_UNIICON ${NSIS_HYP_ICO})
-	set(CPACK_NSIS_MUI_HEADERIMAGE ${NSIS_HYP_LOGO_HORI})
-	set(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP ${NSIS_HYP_LOGO_VERT})
-	set(CPACK_NSIS_DISPLAY_NAME "Hyperion Ambient Light")
-	set(CPACK_NSIS_PACKAGE_NAME "Hyperion")
-	set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\hyperiond.exe")
-	set(CPACK_NSIS_HELP_LINK "https://www.hyperion-project.org")
-	set(CPACK_NSIS_URL_INFO_ABOUT "https://www.hyperion-project.org")
-	set(CPACK_NSIS_MUI_FINISHPAGE_RUN "hyperiond.exe")
-	set(CPACK_NSIS_BRANDING_TEXT "Hyperion-${HYPERION_VERSION}")
-
-	# custom nsis plugin directory
-	set(CPACK_NSIS_EXTRA_DEFS "!addplugindir ${CMAKE_SOURCE_DIR}/cmake/windows/nsis/plugins")
-
-	# additional hyperiond startmenu link, won't be created ifthe user disables startmenu links
-	set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Hyperion (Console).lnk' '$INSTDIR\\\\bin\\\\hyperiond.exe' '-d -c'")
-	set(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Hyperion (Console).lnk'")
+	set(CPACK_EXTERNAL_PACKAGE_SCRIPT ${CMAKE_SOURCE_DIR}/cmake/windows/inno/innosetup.cmake)
+	set(CPACK_EXTERNAL_ENABLE_STAGING ON)
+	set(CPACK_BUILD_CONFIG "${CMAKE_BUILD_TYPE}")
 endif()
 
 # Define the install components
@@ -153,40 +122,44 @@ set(CPACK_COMPONENTS_ALL "Hyperion")
 # Optional compiled
 
 if(ENABLE_REMOTE_CTL)
-	set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_remote")
+	list(APPEND CPACK_COMPONENTS_ALL "hyperion_remote")
 endif()
 
 # only include standalone grabber with build was with flatbuffer client
 if(ENABLE_FLATBUF_CONNECT)
 	if(ENABLE_QT)
-		set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_qt")
+		list(APPEND CPACK_COMPONENTS_ALL "hyperion_qt")
 	endif()
 	if(ENABLE_AMLOGIC)
-		set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_aml")
+		list(APPEND CPACK_COMPONENTS_ALL "hyperion_aml")
 	endif()
 	if(ENABLE_V4L2)
-		set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_v4l2")
+		list(APPEND CPACK_COMPONENTS_ALL "hyperion_v4l2")
 	endif()
 	if(ENABLE_AUDIO)
-		set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_audio")
+		list(APPEND CPACK_COMPONENTS_ALL "hyperion_audio")
 	endif()
 	if(ENABLE_X11)
-		set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_x11")
+		list(APPEND CPACK_COMPONENTS_ALL "hyperion_x11")
 	endif()
 	if(ENABLE_XCB)
-		set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_xcb")
+		list(APPEND CPACK_COMPONENTS_ALL "hyperion_xcb")
 	endif()
 	if(ENABLE_DISPMANX)
-		set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_dispmanx")
+		list(APPEND CPACK_COMPONENTS_ALL "hyperion_dispmanx")
 	endif()
 	if(ENABLE_FB)
-		set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_framebuffer")
+		list(APPEND CPACK_COMPONENTS_ALL "hyperion_framebuffer")
 	endif()
 	if(ENABLE_OSX)
-		set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_osx")
+		list(APPEND CPACK_COMPONENTS_ALL "hyperion_osx")
 	endif()
 endif()
 
+if(ENABLE_DEPLOY_DEPENDENCIES)
+	list(APPEND CPACK_COMPONENTS_ALL "dependencies")
+endif()
+
 # Only include Hyperion to macOS dmg package (without standalone programs)
 if(CPACK_GENERATOR MATCHES "DragNDrop")
 	list(REMOVE_ITEM CPACK_COMPONENTS_ALL "hyperion_remote" "hyperion_qt" "hyperion_osx")
@@ -200,105 +173,3 @@ set(CPACK_STRIP_FILES ON)
 
 # no code after following line!
 include(CPack)
-
-cpack_add_install_type(Full DISPLAY_NAME "Full")
-cpack_add_install_type(Min DISPLAY_NAME "Minimal")
-cpack_add_component_group(Runtime EXPANDED DESCRIPTION "Hyperion runtime")
-
-# Components base
-cpack_add_component(Hyperion
-	DISPLAY_NAME "Hyperion"
-	DESCRIPTION "Hyperion runtime"
-	INSTALL_TYPES Full Min
-	GROUP Runtime
-	REQUIRED
-)
-
-# optional components
-if(ENABLE_REMOTE_CTL)
-	cpack_add_component_group(Remote DESCRIPTION "hyperion-remote commandline tool")
-	cpack_add_component(hyperion_remote
-		DISPLAY_NAME "Hyperion Remote"
-		DESCRIPTION "Hyperion remote cli tool"
-		INSTALL_TYPES Full
-		GROUP Remote
-		DEPENDS Hyperion
-	)
-endif()
-
-# only include standalone grabber with build was with flatbuffer client
-if(ENABLE_FLATBUF_CONNECT)
-	cpack_add_component_group(Screencapture EXPANDED DESCRIPTION "Standalone Screencapture commandline programs")
-	if(ENABLE_QT)
-		cpack_add_component(hyperion_qt
-			DISPLAY_NAME "Qt Standalone Screencap"
-			DESCRIPTION "Qt based standalone screen capture"
-			INSTALL_TYPES Full
-			GROUP Screencapture
-			DEPENDS Hyperion
-		)
-	endif()
-	if(ENABLE_AMLOGIC)
-		cpack_add_component(hyperion_aml
-			DISPLAY_NAME "Amlogic Standalone Screencap"
-			DESCRIPTION "Amlogic based standalone screen capture"
-			INSTALL_TYPES Full
-			GROUP Screencapture
-			DEPENDS Hyperion
-		)
-	endif()
-	if(ENABLE_V4L2)
-		cpack_add_component(hyperion_v4l2
-			DISPLAY_NAME "V4l2 Standalone Screencap"
-			DESCRIPTION "Video for Linux 2 based standalone screen capture"
-			INSTALL_TYPES Full
-			GROUP Screencapture
-			DEPENDS Hyperion
-		)
-	endif()
-	if(ENABLE_X11)
-		cpack_add_component(hyperion_x11
-			DISPLAY_NAME "X11 Standalone Screencap"
-			DESCRIPTION "X11 based standalone screen capture"
-			INSTALL_TYPES Full
-			GROUP Screencapture
-			DEPENDS Hyperion
-		)
-	endif()
-	if(ENABLE_XCB)
-		cpack_add_component(hyperion_xcb
-			DISPLAY_NAME "XCB Standalone Screencap"
-			DESCRIPTION "XCB based standalone screen capture"
-			INSTALL_TYPES Full
-			GROUP Screencapture
-			DEPENDS Hyperion
-		)
-	endif()
-	if(ENABLE_DISPMANX)
-		cpack_add_component(hyperion_dispmanx
-			DISPLAY_NAME "RPi dispmanx Standalone Screencap"
-			DESCRIPTION "Raspbery Pi dispmanx based standalone screen capture"
-			INSTALL_TYPES Full
-			GROUP Screencapture
-			DEPENDS Hyperion
-		)
-	endif()
-	if(ENABLE_FB)
-		cpack_add_component(hyperion_framebuffer
-			DISPLAY_NAME "Framebuffer Standalone Screencap"
-			DESCRIPTION "Framebuffer based standalone screen capture"
-			INSTALL_TYPES Full
-			GROUP Screencapture
-			DEPENDS Hyperion
-		)
-	endif()
-	if(ENABLE_OSX)
-		cpack_add_component(hyperion_osx
-			DISPLAY_NAME "Mac osx Standalone Screencap"
-			DESCRIPTION "Mac osx based standalone screen capture"
-			INSTALL_TYPES Full
-			GROUP Screencapture
-			DEPENDS Hyperion
-		)
-	endif()
-endif()