From 72258b452d2c9b318602ad9294b532cf5d8d69a4 Mon Sep 17 00:00:00 2001
From: Dylan McCall <dylan@endlessos.org>
Date: Thu, 23 Nov 2023 12:06:06 -0800
Subject: [PATCH] Move app ID and prefixes to meson_options

https://github.com/endlessm/endless-key-flatpak/issues/102
---
 .../flatpak/org.endlessos.Key.Devel.json      |  5 ++++-
 meson.build                                   | 17 +++++++--------
 meson_options.txt                             | 21 +++++++++++++++++++
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/build-aux/flatpak/org.endlessos.Key.Devel.json b/build-aux/flatpak/org.endlessos.Key.Devel.json
index bb0dc3c..fd629bb 100644
--- a/build-aux/flatpak/org.endlessos.Key.Devel.json
+++ b/build-aux/flatpak/org.endlessos.Key.Devel.json
@@ -64,7 +64,10 @@
             "builddir" : true,
             "run-tests" : true,
             "config-opts" : [
-                "-Dprofile=development"
+                "-Dprofile=development",
+                "-Dbase_application_id=org.endlessos.Key",
+                "-Dbase_object_path=/org/endlessos/Key",
+                "-Denv_prefix=ENDLESS_KEY_"
             ],
             "sources" : [
                 {
diff --git a/meson.build b/meson.build
index 22a7ee9..28acd37 100644
--- a/meson.build
+++ b/meson.build
@@ -26,15 +26,14 @@ locale_dir = join_paths(get_option('prefix'), get_option('localedir'))
 datadir = join_paths(get_option('prefix'), get_option('datadir'))
 
 build_profile = get_option('profile')
-
-if build_profile == 'default'
-    base_application_id = 'org.endlessos.Key'
-    base_object_path = '/org/endlessos/Key'
-    profile_env_prefix = 'ENDLESS_KEY_'
-elif build_profile == 'development'
-    base_application_id = 'org.endlessos.Key.Devel'
-    base_object_path = '/org/endlessos/Key/Devel'
-    profile_env_prefix = 'ENDLESS_KEY_DEVEL_'
+base_application_id = get_option('base_application_id')
+base_object_path = get_option('base_object_path')
+profile_env_prefix = get_option('env_prefix')
+
+if build_profile == 'development'
+    base_application_id += '.Devel'
+    base_object_path += '/Devel'
+    profile_env_prefix += 'DEVEL_'
 endif
 
 frontend_application_id = base_application_id
diff --git a/meson_options.txt b/meson_options.txt
index a393cc0..f10edbd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,3 +7,24 @@ option(
     ],
     value: 'default'
 )
+
+option(
+    'base_application_id',
+    type: 'string',
+    value: 'org.learningequality.Kolibri',
+    description: 'Base application ID. When profile is "development", ".Devel" is appended'
+)
+
+option(
+    'base_object_path',
+    type: 'string',
+    value: '/org/learningequality/Kolibri',
+    description: 'Base D-Bus object path. When profile is "development", "/Devel" is appended'
+)
+
+option(
+    'env_prefix',
+    type: 'string',
+    value: 'KOLIBRI_',
+    description: 'Prefix for environment variables. When profile is "development", "DEVEL_" is appended'
+)