#2040 Build System Overhaul

.flake8

@@ -7,7 +7,6 @@ exclude =
     FDevIDs/
     venv/
     .venv/
-    wix/
     hotkey/darwin.py  # FIXME: Check under macOS VM at some point
 
 # Show exactly where in a line the error happened

.github/workflows/windows-build.yml

@@ -43,14 +43,13 @@ jobs:
               --exclude=.git* \
               --exclude=.mypy.ini \
               --exclude=.pre-commit-config.yaml \
-              --exclude=Build-exe-and-msi.py \
+              --exclude=build.py \
               --exclude=*.manifest \
               --exclude=coriolis-data \
               --exclude=img \
               --exclude=pyproject.toml \
               --exclude=scripts \
               --exclude=tests \
-              --exclude=wix \
               EDMarketConnector
             mv ../EDMarketConnector-release-${{ needs.variables.outputs.sem_ver }}.tar.gz .
 
@@ -92,7 +91,7 @@ jobs:
           #   directory.
           # NB: If this gets too long it can cause zip 'Command Line Error',
           #   presumably due to a Windows CL length limit.
-          exclusions: 'EDMarketConnector/EDMarketConnector-release-*.* EDMarketConnector/.editorconfig EDMarketConnector/.flake8 EDMarketConnector/.git* EDMarketConnector/.mypy.ini EDMarketConnector/.pre-commit-config.yaml EDMarketConnector/Build-exe-and-msi.py EDMarketConnector/*.manifest EDMarketConnector/coriolis-data/ EDMarketConnector/img/ EDMarketConnector/pyproject.toml EDMarketConnector/scripts/ EDMarketConnector/tests/ EDMarketConnector/wix/'
+          exclusions: 'EDMarketConnector/EDMarketConnector-release-*.* EDMarketConnector/.editorconfig EDMarketConnector/.flake8 EDMarketConnector/.git* EDMarketConnector/.mypy.ini EDMarketConnector/.pre-commit-config.yaml EDMarketConnector/build.py EDMarketConnector/*.manifest EDMarketConnector/coriolis-data/ EDMarketConnector/img/ EDMarketConnector/pyproject.toml EDMarketConnector/scripts/ EDMarketConnector/tests/'
 
       - uses: actions/setup-python@v4
         with:
@@ -112,14 +111,19 @@ jobs:
 
       - name: Build EDMC
         run: |
-          python Build-exe-and-msi.py
+          python build.py
+
+      - name: InnoSetup
+        uses: nadeemjazmawe/inno-setup-action-cli@v6.0.5
+        with:
+            filepath: './EDMC_Installer_Config.iss'
 
       - name: Upload build files
         uses: actions/upload-artifact@v3
         with:
           name: Built files
           path: |
-              EDMarketConnector_win_*.msi
+              EDMarketConnector_Installer_*.exe
               EDMarketConnector-release-*.zip
 
   release:
@@ -136,7 +140,7 @@ jobs:
           path: ./
 
       - name: Hash files
-        run: sha256sum EDMarketConnector_win_*.msi EDMarketConnector-release-*.{zip,tar.gz} > ./hashes.sum
+        run: sha256sum EDMarketConnector_Installer_*.exe EDMarketConnector-release-*.{zip,tar.gz} > ./hashes.sum
 
       - name: Create Draft Release
         uses: "softprops/action-gh-release@v1"
@@ -146,7 +150,7 @@ jobs:
           prerelease: true
           discussion_category_name: "Announcement"
           files: |
-            ./EDMarketConnector_win_*.msi
+            ./EDMarketConnector_Installer_*.exe
             ./EDMarketConnector-release-*.zip
             ./EDMarketConnector-release-*.tar.gz
             ./hashes.sum

.gitignore

@@ -11,10 +11,12 @@ dump
 *.pdb
 *.msi
 *.wixobj
+EDMarketConnector_Installer_*.exe
 appcast_win_*.xml
 appcast_mac_*.xml
 EDMarketConnector.VisualElementsManifest.xml
 *.zip
+EDMC_Installer_Config.iss
 
 .idea
 .vscode