Skip to content

Commit

Permalink
feat: Add Innosetup installer
Browse files Browse the repository at this point in the history
  • Loading branch information
ltoenning committed Nov 2, 2024
1 parent 6072ce3 commit 52f17a7
Show file tree
Hide file tree
Showing 6 changed files with 881 additions and 22 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ jobs:
env:
BACKTRACE_SYMBOL_TOKEN: ${{ secrets.BACKTRACE_SYMBOL_TOKEN }}
BACKTRACE_MINIDUMP_TOKEN: ${{ secrets.BACKTRACE_MINIDUMP_TOKEN }}
BITROCK_BUILDER: "~/installbuilder/bin/builder-cli.exe"

steps:
- name: Install Qt
Expand All @@ -198,27 +197,6 @@ jobs:
cache: true
modules: debug_info
extra: --archives qtbase
- name: Cache InstallBuilder
id: cache-bitrock
uses: actions/cache@v4
with:
path: C:\installbuilder.exe
key: installbuilder-${{ env.bitrock_version }}-windows-x64
- name: Download InstallBuilder
if: steps.cache-bitrock.outputs.cache-hit != 'true'
shell: C:\msys64\usr\bin\bash.exe -le {0}
run: |
wget --retry-connrefused -t 10 -w 10 -T 60 -O /c/installbuilder.exe ${{ env.bitrock_url }}/installbuilder-${{ env.bitrock_version }}-windows-x64-installer.exe
env:
MSYSTEM: MSYS2
- name: Install InstallBuilder
run: |
start -wait "C:\installbuilder.exe" @("--mode", "unattended", "--prefix", "$HOME\installbuilder")
echo >$HOME\license.xml @"
$env:BITROCK_LICENSE
"@
env:
BITROCK_LICENSE: ${{ secrets.BITROCK_LICENSE }}
- name: Install dependencies
run: |
pip install requests PyInstaller
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ cmake-build-*/
/out/
/dist/
CMakeUserPresets.json
installer/innosetup/installer.iss
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,11 @@ if(WIN32)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
endif()

# Configure installer file
if(WIN32)
configure_file(installer/innosetup/installer.iss.in ${CMAKE_CURRENT_SOURCE_DIR}/installer/innosetup/installer.iss)
endif()

message(STATUS "Simulators:")
message(STATUS "\t FS9: ${SWIFT_BUILD_FS9_PLUGIN}")
message(STATUS "\t FSX: ${SWIFT_BUILD_FSX_PLUGIN}")
Expand Down
Loading

0 comments on commit 52f17a7

Please sign in to comment.