Hyperion Light updates (#1434)

* Hyperion Light - Allow hyperion remote as component * Fix missing guard * NSIS installation via Choco removed because already installed on windows server 2022 * Correct CMAKEList defaults * Align package creation with build rules for components * Fix Copy/Paste issue Co-authored-by: Paulchen Panther <Paulchen-Panter@protonmail.com>
2025-03-01 10:33:28 +00:00 · 2022-03-05 15:18:01 +01:00
parent 14b6a114bb
commit 5cd3881067
7 changed files with 143 additions and 118 deletions
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -159,10 +159,10 @@ jobs:
          path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
          key: ${{ runner.os }}-chocolatey

-      - name: Install Python, NSIS, OpenSSL, DirectX SDK
+      - name: Install Python, OpenSSL, DirectX SDK
        shell: powershell
        run: |
-          choco install --no-progress python nsis openssl directx-sdk -y
+          choco install --no-progress python openssl directx-sdk -y

      - name: Install libjpeg-turbo
        run: |
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -122,10 +122,10 @@ jobs:
          path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
          key: ${{ runner.os }}-chocolatey

-      - name: Install Python, NSIS, OpenSSL, DirectX SDK
+      - name: Install Python, OpenSSL, DirectX SDK
        shell: powershell
        run: |
-          choco install --no-progress python nsis openssl directx-sdk -y
+          choco install --no-progress python openssl directx-sdk -y

      - name: Install libjpeg-turbo
        run: |
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,7 @@ SET ( DEFAULT_DEV_WS281XPWM               OFF )
 SET ( DEFAULT_AVAHI                       ON  )
 SET ( DEFAULT_EFFECTENGINE                ON  )
 SET ( DEFAULT_EXPERIMENTAL                OFF )
+SET ( DEFAULT_REMOTE_CTL                  ON  )

 # Build
 SET ( DEFAULT_JSONCHECKS                  ON  )
@@ -296,10 +297,10 @@ message(STATUS "LED-Device options:")
 addIndent(" - ")

 option(ENABLE_DEV_NETWORK "Enable the Network devices" ${DEFAULT_DEV_NETWORK} )
-message(STATUS "DEFAULT_DEV_NETWORK = ${DEFAULT_DEV_NETWORK}")
+message(STATUS "ENABLE_DEV_NETWORK = ${ENABLE_DEV_NETWORK}")

 option(ENABLE_DEV_SERIAL "Enable the Serial devices" ${DEFAULT_DEV_SERIAL} )
-message(STATUS "DEFAULT_DEV_SERIAL = ${DEFAULT_DEV_SERIAL}")
+message(STATUS "ENABLE_DEV_SERIAL = ${ENABLE_DEV_SERIAL}")

 option(ENABLE_DEV_SPI "Enable the SPI device" ${DEFAULT_DEV_SPI} )
 message(STATUS "ENABLE_DEV_SPI = ${ENABLE_DEV_SPI}")
@@ -318,15 +319,18 @@ removeIndent()
 message(STATUS "Services options:")
 addIndent(" - ")

-option(ENABLE_EFFECTENGINE "Enable Effect-Engine" ${DEFAULT_EFFECTENGINE})
-message(STATUS "ENABLE_EFFECTENGINE = " ${ENABLE_EFFECTENGINE})
-
 option(ENABLE_AVAHI "Enable Zeroconf" ${DEFAULT_AVAHI})
 message(STATUS "ENABLE_AVAHI = " ${ENABLE_AVAHI})

+option(ENABLE_EFFECTENGINE "Enable Effect-Engine" ${DEFAULT_EFFECTENGINE})
+message(STATUS "ENABLE_EFFECTENGINE = " ${ENABLE_EFFECTENGINE})
+
 option(ENABLE_EXPERIMENTAL "Compile experimental features" ${DEFAULT_EXPERIMENTAL})
 message(STATUS "ENABLE_EXPERIMENTAL = ${ENABLE_EXPERIMENTAL}")

+option(ENABLE_REMOTE_CTL "Enable Hyperion remote control" ${DEFAULT_REMOTE_CTL})
+message(STATUS "ENABLE_REMOTE_CTL = " ${ENABLE_REMOTE_CTL})
+
 removeIndent()

 message(STATUS "Build options:")
@@ -338,6 +342,12 @@ message(STATUS "ENABLE_JSONCHECKS = ${ENABLE_JSONCHECKS}")
 option(ENABLE_DEPLOY_DEPENDENCIES "Deploy with dependencies" ${DEFAULT_DEPLOY_DEPENDENCIES})
 message(STATUS "ENABLE_DEPLOY_DEPENDENCIES = ${ENABLE_DEPLOY_DEPENDENCIES}")

+option(ENABLE_PROFILER "enable profiler capabilities - not for release code" OFF)
+message(STATUS "ENABLE_PROFILER = ${ENABLE_PROFILER}")
+
+option(ENABLE_TESTS "Compile additional test applications" ${DEFAULT_TESTS})
+message(STATUS "ENABLE_TESTS = ${ENABLE_TESTS}")
+
 if (ENABLE_AVAHI)
 message(STATUS "DEFAULT_USE_SHARED_AVAHI_LIBS = ${DEFAULT_USE_SHARED_AVAHI_LIBS}")
 endif()
@@ -345,12 +355,6 @@ message(STATUS "DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS = ${DEFAULT_USE_SYSTEM_FLATB
 message(STATUS "DEFAULT_USE_SYSTEM_MBEDTLS_LIBS = ${DEFAULT_USE_SYSTEM_MBEDTLS_LIBS}")
 message(STATUS "DEFAULT_USE_SYSTEM_PROTO_LIBS = ${DEFAULT_USE_SYSTEM_PROTO_LIBS}")

-option(ENABLE_PROFILER "enable profiler capabilities - not for release code" OFF)
-message(STATUS "ENABLE_PROFILER = ${ENABLE_PROFILER}")
-
-option(ENABLE_TESTS "Compile additional test applications" ${DEFAULT_TESTS})
-message(STATUS "ENABLE_TESTS = ${ENABLE_TESTS}")
-
 removeIndent()

 SET ( FLATBUFFERS_INSTALL_BIN_DIR ${CMAKE_BINARY_DIR}/flatbuf )
--- a/HyperionConfig.h.in
+++ b/HyperionConfig.h.in
@@ -78,6 +78,9 @@
 // Define to enable experimental features
 #cmakedefine ENABLE_EXPERIMENTAL

+// Define to enable Hyperion remote control
+#cmakedefine ENABLE_REMOTE_CTL
+
 // Define to enable profiler for development purpose
 #cmakedefine ENABLE_PROFILER

--- a/cmake/packages.cmake
+++ b/cmake/packages.cmake
@@ -138,9 +138,14 @@ SET ( CPACK_COMPONENTS_GROUPING "ALL_COMPONENTS_IN_ONE")
 # Components base (All builds)
 SET ( CPACK_COMPONENTS_ALL "Hyperion" )

-SET ( CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_remote" )
-
 # Optional compiled
+
+if(ENABLE_REMOTE_CTL)
+	SET ( CPACK_COMPONENTS_ALL ${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" )
 	endif()
@@ -165,6 +170,7 @@ endif()
 	if(ENABLE_OSX)
 		SET ( CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_osx" )
 	endif()
+endif(ENABLE_FLATBUF_CONNECT)

 # Only include Hyperion to macOS dmg package (without standalone programs)
 IF ( CPACK_GENERATOR MATCHES "DragNDrop" )
@@ -182,8 +188,7 @@ 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 and hyperion-remote commandline tool")
-cpack_add_component_group(Screencapture EXPANDED DESCRIPTION "Standalone Screencapture commandline programs")
+cpack_add_component_group(Runtime EXPANDED DESCRIPTION "Hyperion runtime")

 # Components base
 cpack_add_component(Hyperion
@@ -194,15 +199,22 @@ cpack_add_component(Hyperion
 	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 Runtime
+	GROUP Remote
 	DEPENDS Hyperion
 )
+endif()

-# optional compiled
+# 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"
@@ -239,7 +251,7 @@ if(ENABLE_X11)
 			DEPENDS Hyperion
 		)
 	endif()
-if(ENABLE_X11)
+	if(ENABLE_XCB)
 		cpack_add_component(hyperion_xcb
 			DISPLAY_NAME "XCB Standalone Screencap"
 			DESCRIPTION "XCB based standalone screen capture"
@@ -275,3 +287,4 @@ if(ENABLE_OSX)
 			DEPENDS Hyperion
 		)
 	endif()
+endif(ENABLE_FLATBUF_CONNECT)
--- a/dependencies/CMakeLists.txt
+++ b/dependencies/CMakeLists.txt
@@ -1,4 +1,6 @@
+if (ENABLE_DEV_USB_HID)
 	add_subdirectory(build/hidapi)
+endif()

 if (ENABLE_DEV_TINKERFORGE)
 	add_subdirectory(build/tinkerforge)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,10 @@
 add_subdirectory(hyperiond)
-add_subdirectory(hyperion-remote)

 # The following binaries are just compiled if requested
+if (ENABLE_REMOTE_CTL)
+	add_subdirectory(hyperion-remote)
+endif()
+
 if (ENABLE_AMLOGIC AND ENABLE_FLATBUF_CONNECT)
 	add_subdirectory(hyperion-aml)
 endif()