From 91da2ddfdd8fb0a63ed30d2ef94c88e13f907f27 Mon Sep 17 00:00:00 2001
From: Francesco Abbate <francesco.bbt@gmail.com>
Date: Sat, 4 Sep 2021 18:15:07 +0200
Subject: [PATCH] Move innosetup meson config into scripts directory

The purpose is to keep the main meson build file as simple as possible
while keeping the innosetup config.
---
 meson.build                    | 8 +-------
 scripts/innosetup/innosetup.sh | 2 +-
 scripts/meson.build            | 8 ++++++++
 3 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 scripts/meson.build

diff --git a/meson.build b/meson.build
index 7e9b4ab1..611d154a 100644
--- a/meson.build
+++ b/meson.build
@@ -14,13 +14,6 @@ conf_data.set('PROJECT_BUILD_DIR', meson.current_build_dir())
 conf_data.set('PROJECT_SOURCE_DIR', meson.current_source_dir())
 conf_data.set('PROJECT_VERSION', meson.project_version())
 
-if host_machine.system() == 'windows'
-    configure_file(
-        input : 'scripts/innosetup/innosetup.iss.in',
-        output : 'innosetup.iss',
-        configuration : conf_data
-    )
-endif
 #===============================================================================
 # Compiler Settings
 #===============================================================================
@@ -127,3 +120,4 @@ configure_file(
 #===============================================================================
 subdir('lib/font_renderer')
 subdir('src')
+subdir('scripts')
diff --git a/scripts/innosetup/innosetup.sh b/scripts/innosetup/innosetup.sh
index b2d0e86c..44a6c787 100644
--- a/scripts/innosetup/innosetup.sh
+++ b/scripts/innosetup/innosetup.sh
@@ -51,5 +51,5 @@ else
   ARCH=Win32
 fi
 
-/c/Program\ Files\ \(x86\)/Inno\ Setup\ 6/ISCC.exe -dARCH=$ARCH $BUILD_DIR/innosetup.iss
+/c/Program\ Files\ \(x86\)/Inno\ Setup\ 6/ISCC.exe -dARCH=$ARCH $BUILD_DIR/scripts/innosetup.iss
 mv $BUILD_DIR/LiteXL*.exe $(pwd)
diff --git a/scripts/meson.build b/scripts/meson.build
new file mode 100644
index 00000000..8b45814d
--- /dev/null
+++ b/scripts/meson.build
@@ -0,0 +1,8 @@
+if host_machine.system() == 'windows'
+    configure_file(
+        input : 'innosetup/innosetup.iss.in',
+        output : 'innosetup.iss',
+        configuration : conf_data
+    )
+endif
+