From 1c51da27502e5bcf80d359b28ae8e66723d951d8 Mon Sep 17 00:00:00 2001
From: kramo <93832451+kra-mo@users.noreply.github.com>
Date: Thu, 29 Jun 2023 10:53:32 +0200
Subject: [PATCH] Configure Cartridges.iss via meson

---
 .github/workflows/windows.yml                 | 2 +-
 meson.build                                   | 9 +++++++++
 windows/{Cartridges.iss => Cartridges.iss.in} | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 rename windows/{Cartridges.iss => Cartridges.iss.in} (94%)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 7e9f264..5c7da42 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -24,7 +24,7 @@ jobs:
           pacman --noconfirm -Rs mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-meson git
           find /ucrt64/share/locale/ -type f ! -name "*cartridges.mo" -delete
       - name: "Inno Setup"
-        run: iscc ".\windows\Cartridges.iss"
+        run: iscc ".\_build\Cartridges.iss"
       - name: "Upload Artifact"
         uses: actions/upload-artifact@v3
         with:
diff --git a/meson.build b/meson.build
index f58ac1f..6899eb2 100644
--- a/meson.build
+++ b/meson.build
@@ -21,6 +21,7 @@ endif
 
 conf = configuration_data()
 conf.set('PYTHON', python.find_installation('python3').full_path())
+conf.set('PYTHON_VERSION', python.find_installation('python3').language_version())
 conf.set('APP_ID', app_id)
 conf.set('PREFIX', prefix)
 conf.set('VERSION', meson.project_version())
@@ -32,6 +33,14 @@ subdir('data')
 subdir('src')
 subdir('po')
 
+configure_file(
+  input: './windows/Cartridges.iss.in',
+  output: 'Cartridges.iss',
+  configuration: conf,
+  install: true,
+  install_dir: '.'
+)
+
 gnome.post_install(
      glib_compile_schemas: true,
     gtk_update_icon_cache: true,
diff --git a/windows/Cartridges.iss b/windows/Cartridges.iss.in
similarity index 94%
rename from windows/Cartridges.iss
rename to windows/Cartridges.iss.in
index 6491206..56011c6 100644
--- a/windows/Cartridges.iss
+++ b/windows/Cartridges.iss.in
@@ -1,5 +1,5 @@
 #define MyAppName "Cartridges"
-#define MyAppVersion "1.5.6"
+#define MyAppVersion "@VERSION@"
 #define MyAppPublisher "kramo"
 #define MyAppURL "https://github.com/kra-mo/cartridges"
 #define MyAppExeName "pythonw.exe"
@@ -42,7 +42,7 @@ Source: "D:\a\_temp\msys64\ucrt64\etc\ssl\*"; DestDir: "{app}\etc\ssl"; Flags: r
 
 Source: "D:\a\_temp\msys64\ucrt64\lib\gdk-pixbuf-2.0\*"; DestDir: "{app}\lib\gdk-pixbuf-2.0"; Flags: recursesubdirs ignoreversion   
 Source: "D:\a\_temp\msys64\ucrt64\lib\girepository-1.0\*"; DestDir: "{app}\lib\girepository-1.0"; Flags: recursesubdirs ignoreversion 
-Source: "D:\a\_temp\msys64\ucrt64\lib\python3.10\*"; DestDir: "{app}\lib\python3.10"; Excludes: "__pycache__"; Flags: recursesubdirs ignoreversion
+Source: "D:\a\_temp\msys64\ucrt64\lib\python@PYTHON_VERSION@\*"; DestDir: "{app}\lib\python@PYTHON_VERSION@"; Excludes: "__pycache__"; Flags: recursesubdirs ignoreversion
 
 Source: "D:\a\_temp\msys64\ucrt64\share\cartridges\*"; DestDir: "{app}\share\cartridges"; Excludes: "__pycache__"; Flags: recursesubdirs ignoreversion
 Source: "D:\a\_temp\msys64\ucrt64\share\icons\*"; DestDir: "{app}\share\icons"; Excludes: "*.png,cursors\*"; Flags: recursesubdirs ignoreversion