Set application ID from Meson HEAD main

4 files changed, 9 insertions, 2 deletions

diff --git a/build.rs b/build.rs
index 1adc0c1..08ac6e2 100755
--- a/build.rs
+++ b/build.rs
@@ -1,6 +1,8 @@
 fn main() {
     println!("cargo::rerun-if-env-changed=PKGDATADIR");
     println!("cargo::rerun-if-env-changed=LOCALEDIR");
+    println!("cargo::rerun-if-env-changed=APP_ID");
+
     println!("cargo::rerun-if-changed=./build.rs");
     if std::env::var_os("PKGDATADIR").is_none() {
         println!("cargo::rustc-env=PKGDATADIR={}", {
@@ -18,6 +20,10 @@ fn main() {
         }.display())
     }
 
+    if std::env::var_os("APP_ID").is_none() {
+        println!("cargo::rustc-env=APP_ID=xyz.vikanezrimaya.kittybox.Bowl")
+    }
+
     relm4_icons_build::bundle_icons(
         "icons.rs",
         Some("xyz.vikanezrimaya.kittybox.Bowl"),
diff --git a/data/meson.build b/data/meson.build
index 59f3f90..30fcded 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -66,7 +66,7 @@ configure_file(
   install_dir: datadir / 'glib-2.0' / 'schemas'
 )
 
-# Validata GSchema
+# Validate GSchema
 test(
   'validate-gschema', glib_compile_schemas,
   args: [
diff --git a/src/lib.rs b/src/lib.rs
index bdc3682..4ecc139 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -35,7 +35,7 @@ use soup::prelude::SessionExt;
 pub mod secrets;
 pub mod micropub;
 pub mod util;
-pub const APPLICATION_ID: &str = "xyz.vikanezrimaya.kittybox.Bowl";
+pub const APPLICATION_ID: &str = env!("APP_ID");
 pub const CLIENT_ID_STR: &str = "https://kittybox.fireburn.ru/bowl/";
 
 #[derive(Debug)]
diff --git a/src/meson.build b/src/meson.build
index 3bc0c3f..d9adfb7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -20,6 +20,7 @@ cargo_env = [
     'CARGO_HOME=' + meson.project_build_root() / 'cargo-home',
     'PKGDATADIR=' + pkgdatadir,
     'LOCALEDIR=' + localedir,
+    'APP_ID=' + application_id,
 ]
 
 cargo_build = custom_target(