cleanup packages.cmake & extend NSIS plugin directory

.github/workflows/pull-request.yml

@@ -149,13 +149,8 @@ jobs:
         with:
           python-version: '3.x'
 
-      - name: Install NSIS & copy plugins
-        run: |
-          choco install --no-progress nsis -y
-          copy "cmake\nsis\template\*.dll" "C:\Program Files (x86)\NSIS\Plugins\x86-ansi\"
-
-      - name: Install OpenSSL
-        run: choco install --no-progress openssl -y
+      - name: Install OpenSSL & NSIS
+        run: choco install --no-progress openssl nsis -y
 
       - name: Set up x64 build architecture environment
         shell: cmd

.github/workflows/push-master.yml

@@ -113,13 +113,8 @@ jobs:
         with:
           python-version: '3.x'
 
-      - name: Install NSIS & copy plugins
-        run: |
-          choco install --no-progress nsis -y
-          copy "cmake\nsis\template\*.dll" "C:\Program Files (x86)\NSIS\Plugins\x86-ansi\"
-
-      - name: Install OpenSSL
-        run: choco install --no-progress openssl -y
+      - name: Install OpenSSL & NSIS
+        run: choco install --no-progress openssl nsis -y
 
       - name: Set up x64 build architecture environment
         shell: cmd

.vscode/tasks.json

@@ -11,7 +11,7 @@
       "windows": {
         "command": "cmake -G \"Visual Studio 16 2019\" -A x64 -B ${workspaceFolder}/build"
       },
-      "group": "build",
+      "group": "build"
     },
     {
       "label": "cmake:conf Debug",
@@ -21,7 +21,7 @@
       "windows": {
         "command": "cmake -G \"Visual Studio 16 2019\" -A x64 -B ${workspaceFolder}/build"
       },
-      "group": "build",
+      "group": "build"
     },
     {
       "label": "build:debug hyperiond",

CompileHowto.md

@@ -84,7 +84,7 @@ brew install zlib
 ```
 
 ## Windows (WIP)
-We assume a 64bit Windows 7 or higher. Install the following
+We assume a 64bit Windows 7 or higher. Install the following;
 - [Git](https://git-scm.com/downloads) (Check: Add to PATH)
 - [CMake (Windows win64-x64 Installer)](https://cmake.org/download/) (Check: Add to PATH)
 - [Visual Studio 2019 Build Tools](https://go.microsoft.com/fwlink/?linkid=840931) ([direct link](https://aka.ms/vs/16/release/vs_buildtools.exe))
@@ -95,6 +95,8 @@ We assume a 64bit Windows 7 or higher. Install the following
   - Open a console window and execute `pip install aqtinstall`.
   - Now we can download Qt to _C:\Qt_ `mkdir c:\Qt && aqt install -O c:\Qt 5.15.0 windows desktop win64_msvc2019_64`
 
+- Optional for package creation: [NSIS 3.x](https://sourceforge.net/projects/nsis/files/NSIS%203/) ([direct link](https://sourceforge.net/projects/nsis/files/latest/download))
+
 # Compiling and installing Hyperion
 
 ### The general quick way (without big comments)

cmake/nsis/template/NSIS.template.in

@@ -43,6 +43,8 @@
   ;Tnstaller window branding text
   BrandingText /TRIMLEFT "@CPACK_NSIS_BRANDING_TEXT@"
 
+@CPACK_NSIS_EXTRA_DEFS@
+
 @CPACK_NSIS_DEFINES@
 
   !include Sections.nsh

cmake/packages.cmake

@@ -105,19 +105,12 @@ 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/nsis/plugins")
 # additional hyperiond startmenu link, won't be created if the 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_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Hyperion.lnk' '$INSTDIR\\\\bin\\\\hyperiond.exe'")
-#SET ( CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\Hyperion.lnk'")
-# hyperiond desktop link
-#SET ( CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$DESKTOP\\\\Hyperion.lnk' '$INSTDIR\\\\bin\\\\hyperiond.exe' ")
-#SET ( CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete '$DESKTOP\\\\Hyperion.lnk' ")
-#SET ( CPACK_NSIS_EXTRA_INSTALL_COMMANDS "CreateShortCut \\\"$DESKTOP\\\\Hyperion.lnk\\\" \\\"$INSTDIR\\\\bin\\\\hyperiond.exe\\\" ")
-#SET ( CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete \\\"$DESKTOP\\\\Hyperion.lnk\\\" ")
-
 # define the install components
 # See also https://gitlab.kitware.com/cmake/community/-/wikis/doc/cpack/Component-Install-With-CPack
 # and https://cmake.org/cmake/help/latest/module/CPackComponent.html