Merge pull request #11 from rafaelfassi/include-msvc-runtime

Bundle msvc runtime in the installer

Author: rafaelfassi

.github/workflows/windows-build.yml

@@ -19,7 +19,10 @@ jobs:
         id: strings
         shell: bash
         run: |
-          echo "build-output-dir=${{ github.workspace }}\build" >> "$GITHUB_OUTPUT"
+          echo "build-type=Release" >> "$GITHUB_OUTPUT"
+          echo "build-dir=${{ github.workspace }}\build" >> "$GITHUB_OUTPUT"
+          echo "out-dir=${{ github.workspace }}\build\output" >> "$GITHUB_OUTPUT"
+          echo "bin-dir=${{ github.workspace }}\build\output\bin" >> "$GITHUB_OUTPUT"
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
@@ -29,38 +32,54 @@ jobs:
           target: 'desktop'
           arch: 'win64_msvc2022_64'
 
-      - name: Configure CMake
+      - name: CMake Configure
         run: >
-          cmake -B ${{ steps.strings.outputs.build-output-dir }}
+          cmake -B ${{ steps.strings.outputs.build-dir }}
           -DCMAKE_CXX_COMPILER=cl
           -DCMAKE_C_COMPILER=cl
-          -DCMAKE_BUILD_TYPE=Release
+          -DCMAKE_BUILD_TYPE=${{ steps.strings.outputs.build-type }}
           -S ${{ github.workspace }}
 
-      - name: Build
-        run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config Release
+      - name: CMake Build
+        run: >
+          cmake --build ${{ steps.strings.outputs.build-dir }}
+          --config ${{ steps.strings.outputs.build-type }}
+
+      - name: CMake Install
+        run: >
+          cmake --install ${{ steps.strings.outputs.build-dir }}
+          --config ${{ steps.strings.outputs.build-type }}
+          --prefix ${{ steps.strings.outputs.out-dir }}
 
       - name: Get Qt Dependency Libs
-        run: windeployqt --release --no-translations ${{ steps.strings.outputs.build-output-dir }}\Release\qlogexplorer.exe
+        run: windeployqt --release --no-translations ${{ steps.strings.outputs.bin-dir }}\qlogexplorer.exe
+
+      - name: Create Zip archive
+        run: >
+          Compress-Archive
+          -Path ${{ steps.strings.outputs.bin-dir }}\*
+          -DestinationPath ${{ steps.strings.outputs.out-dir }}\QLogExplorer-Win64-Portable.zip
 
-      - name: Build Installed
+      - name: Build Installer Application
         uses: Minionguyjpro/Inno-Setup-Action@v1.2.7
         with:
           path: packaging/win/innosetup.iss
           options: |
             /O+
             /DSrcDir=${{ github.workspace }}
-            /DBuildBinDir=${{ steps.strings.outputs.build-output-dir }}\Release
+            /DOutBinDir=${{ steps.strings.outputs.bin-dir }}
 
-      - name: Upload installer as artifact
+      - name: Upload Artifact
         if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
         uses: actions/upload-artifact@v4
         with:
-          name: QLogExplorer-Installer
-          path: ${{ steps.strings.outputs.build-output-dir }}\Release\QLogExplorer-Win64-Setup.exe
+          name: QLogExplorer-Bundle
+          path: ${{ steps.strings.outputs.bin-dir }}\*
 
       - name: Publish GitHub Release
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v2
         with:
-          files: ${{ steps.strings.outputs.build-output-dir }}\Release\QLogExplorer-Win64-Setup.exe
+          files: |
+            ${{ steps.strings.outputs.bin-dir }}\QLogExplorer-Win64-Setup.exe
+            ${{ steps.strings.outputs.out-dir }}\QLogExplorer-Win64-Portable.zip

CMakeLists.txt

@@ -30,6 +30,8 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network REQUIRED)
 find_package(Threads REQUIRED)
 
+include(InstallRequiredSystemLibraries)
+
 set(MAIN_SOURCES
     qlogexplorer.qrc
     src/main.cpp

packaging/win/innosetup.iss

@@ -11,9 +11,9 @@
 #define AppAssocName AppName
 #define PlatformType "Win64"
 
-; Needs to be provided by the command line args: /DSrcDir=<src-dir> /DBuildBinDir=<build-dir>
+; Needs to be provided by the command line args: /DSrcDir=<src-dir> /DOutBinDir=<build-dir>
 ;#define SrcDir "<src-dir>"
-;#define BuildBinDir "<build-dir>"
+;#define OutBinDir "<build-dir>"
 
 [Setup]
 AppId={{52CADC64-418D-43B8-8A1A-D5C47619D786}
@@ -31,7 +31,7 @@ LicenseFile={#SrcDir}\LICENSE
 ; Remove the following line to run in administrative install mode (install for all users.)
 PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
-OutputDir={#BuildBinDir}
+OutputDir={#OutBinDir}
 OutputBaseFilename={#AppName}-{#PlatformType}-Setup
 SetupIconFile={#SrcDir}\packaging\win\{#ProjName}.ico
 Compression=lzma
@@ -45,15 +45,15 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "{#BuildBinDir}\{#AppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BuildBinDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BuildBinDir}\generic\*"; DestDir: "{app}\generic"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#BuildBinDir}\iconengines\*"; DestDir: "{app}\iconengines"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#BuildBinDir}\imageformats\*"; DestDir: "{app}\imageformats"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#BuildBinDir}\networkinformation\*"; DestDir: "{app}\networkinformation"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#BuildBinDir}\platforms\*"; DestDir: "{app}\platforms"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#BuildBinDir}\styles\*"; DestDir: "{app}\styles"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#BuildBinDir}\tls\*"; DestDir: "{app}\tls"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#OutBinDir}\{#AppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#OutBinDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#OutBinDir}\generic\*"; DestDir: "{app}\generic"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#OutBinDir}\iconengines\*"; DestDir: "{app}\iconengines"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#OutBinDir}\imageformats\*"; DestDir: "{app}\imageformats"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#OutBinDir}\networkinformation\*"; DestDir: "{app}\networkinformation"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#OutBinDir}\platforms\*"; DestDir: "{app}\platforms"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#OutBinDir}\styles\*"; DestDir: "{app}\styles"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#OutBinDir}\tls\*"; DestDir: "{app}\tls"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Registry]