Refine build workflow and installer script

Streamlined the GitHub Actions workflow by cleaning up comments, improving version extraction, and correcting LICENSE file handling. Updated the Inno Setup installer script to simplify output paths, improve task descriptions, add an option to register as a Windows service, and clean up file and registry sections for clarity and maintainability.

Author: Armoghan-ul-Mohmin

.github/workflows/Build-Intrudex-Client.yaml

@@ -23,7 +23,6 @@ jobs:
       - name: 📥 Install MinGW
         run: choco install mingw -y
 
-      # Install Inno Setup
       - name: 📥 Install Inno Setup
         run: choco install innosetup -y
 
@@ -45,37 +44,40 @@ jobs:
           cmake -S Intrudex-Client -B Intrudex-Client\Build-Files -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release
           cmake --build Intrudex-Client\Build-Files -- -j4
 
-      # Extract version from version.rc
       - name: 🏷️ Extract Version from version.rc
         id: get_version
         shell: pwsh
         run: |
           $rcFile = "Intrudex-Client/version.rc"
-          if (!(Test-Path $rcFile)) { $rcFile = "Intrudex-Client/version.rc" }
           $versionLine = Select-String -Path $rcFile -Pattern 'FILEVERSION\s+([0-9, ]+)' | Select-Object -First 1
           if ($versionLine) {
             $ver = $versionLine.Matches[0].Groups[1].Value -replace '[ ,]+', '.'
             $ver = $ver.Trim('.')
             echo "VERSION=$ver" >> $env:GITHUB_ENV
           } else {
-            echo "VERSION=unknown" >> $env:GITHUB_ENV
+            echo "VERSION=0.0.1" >> $env:GITHUB_ENV
           }
 
-      - name: 📋 Prepare Installer Directory
+      - name: 📄 Copy Installer Script and License
+        shell: pwsh
         run: |
-          Remove-Item -Recurse -Force Intrudex-Client\build -ErrorAction SilentlyContinue
-          New-Item -ItemType Directory -Force -Path Intrudex-Client\build
-          Copy-Item -Recurse -Force Intrudex-Client\Build-Files\* Intrudex-Client\build\
-
-      # Ensure LICENSE is present for the installer
-      - name: 📄 Copy LICENSE for Installer
-        run: Copy-Item LICENSE Intrudex-Client-installer.iss -Destination Intrudex
+          Copy-Item -Path "LICENSE", "Intrudex-Client-installer.iss" -Destination "Intrudex"
 
-      - name: 🛠 Build Installer
+      - name: 🛠 Build Installer using Inno Setup
         shell: pwsh
         run: |
           & "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "Intrudex-Client-installer.iss"
 
+      - name: 📝 Move & Rename Setup for Release
+        shell: pwsh
+        run: |
+          $installerPath = Get-ChildItem -Recurse -Filter "Intrudex-Client-Setup-*.exe" | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+          if ($installerPath) {
+            Copy-Item $installerPath.FullName -Destination "Intrudex-Client-Setup.exe"
+          } else {
+            throw "Installer EXE not found!"
+          }
+
       - name: 📦 Create Zip Archive of Build Folder
         run: |
           Compress-Archive -Path Intrudex-Client\build -DestinationPath intrudex-client-build.zip
@@ -144,4 +146,4 @@ jobs:
 
           files: |
             intrudex-client-build.zip
-            Intrudex-Client-Setup.exe
+            Intrudex-Client-Setup.exe

Intrudex-Client-installer.iss

@@ -1,45 +1,32 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
 #define MyAppName "Intrudex-Client"
 #define MyAppVersion "1.0.0"
 #define MyAppPublisher "ToolsHive, Inc."
 #define MyAppURL "https://github.com/ToolsHive/Intrudex/"
 #define MyAppExeName "Intrudex_Client.exe"
-#define MyAppAssocName MyAppName + ""
+#define MyAppServiceName "IntrudexClientService"
+#define MyAppAssocName MyAppName
 #define MyAppAssocExt ".myp"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
 
 [Setup]
-; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{F599BB8F-FF0F-4965-B2C3-D46682D7DBF5}
+AppId={{F599BB8F-FF0F-4965-B2C3-D46682D7DBF5}}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={autopf}\{#MyAppName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
-; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run
-; on anything but x64 and Windows 11 on Arm.
 ArchitecturesAllowed=x64compatible
-; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
-; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
-; meaning it should use the native 64-bit Program Files directory and
-; the 64-bit view of the registry.
 ArchitecturesInstallIn64BitMode=x64compatible
 ChangesAssociations=yes
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
-LicenseFile=Intrudex\LICENSE
-; Uncomment the following line to run in non administrative install mode (install for current user only).
-;PrivilegesRequired=lowest
+LicenseFile=LICENSE
 PrivilegesRequiredOverridesAllowed=dialog
-OutputDir=C:\Users\armog\OneDrive\Desktop\Intrudex-Client
-OutputBaseFilename=Intrudex-Client-Setup
+OutputDir=.
+OutputBaseFilename=Intrudex-Client-Setup-v{#MyAppVersion}
 SolidCompression=yes
 WizardStyle=modern
 
@@ -48,29 +35,21 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: autostart; Description: "Start Intrudex Client with Windows"; GroupDescription: "Startup options:"; Flags: unchecked
+Name: "autostart"; Description: "Start Intrudex Client after installation"; GroupDescription: "Startup options:"; Flags: unchecked
+Name: "registerservice"; Description: "Register Intrudex Client as a Windows Service (requires admin)"; GroupDescription: "Service Options:"; Flags: unchecked
 
 [Files]
-; Main EXE
-Source: "Intrudex-Client\build\Intrudex_Client.exe"; DestDir: "{app}"; Flags: ignoreversion
-
-; All folders and files under build (preserve structure)
+Source: "Intrudex-Client\build\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Intrudex-Client\build\config\*"; DestDir: "{app}\config"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "Intrudex-Client\build\assets\*"; DestDir: "{app}\assets"; Flags: ignoreversion recursesubdirs createallsubdirs
-
-; All DLLs at the root of build
 Source: "Intrudex-Client\build\*.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 [Registry]
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
-; Optional: Write uninstall path
-Root: HKLM; Subkey: "Software\Microsoft\Windows\CurrentVersion\Uninstall\Intrudex_Client"; ValueType: string; ValueName: "UninstallString"; ValueData: """{uninstallexe}"""
-; Auto-start only if selected in [Tasks]
-Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "IntrudexClient"; ValueData: """{app}\intrudex-client.exe"""; Tasks: autostart
-
+Root: HKLM; Subkey: "Software\Microsoft\Windows\CurrentVersion\Uninstall\{#MyAppName}"; ValueType: string; ValueName: "UninstallString"; ValueData: """{uninstallexe}"""
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
@@ -79,5 +58,9 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+; Start the app if selected
+Filename: "{app}\{#MyAppExeName}"; Description: "Launch Intrudex Client now"; Flags: nowait postinstall skipifsilent; Tasks: autostart
 
+; Register the EXE as a system service (if selected)
+; Assumes the EXE can run as a service and doesn't terminate immediately
+Filename: "sc.exe"; Parameters: "create {#MyAppServiceName} binPath= ""{app}\{#MyAppExeName}"" DisplayName= ""Intrudex Client Service"" start= auto"; StatusMsg: "Registering as system service..."; Flags: runhidden runascurrentuser; Tasks: registerservice