[gnome-builder] build: fix various app-id assignments

[Christian Hergert <chergert src gnome org>]

commit 592b115709bb2f4e168088fe462b658757316a20
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jul 13 01:00:05 2022 -0700

    build: fix various app-id assignments

 data/appdata/meson.build                                  | 15 +++++++++++----
 ...appdata.xml.in => org.gnome.Builder.appdata.xml.in.in} |  6 +++---
 data/meson.build                                          |  6 ++++--
 data/org.gnome.Builder.desktop.in.in                      |  2 +-
 data/org.gnome.Builder.service.in                         |  2 +-
 5 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index 2b6268557..ca0d01c18 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -1,8 +1,15 @@
+appdata_config = configuration_data()
+appdata_config.set('app_id', app_id)
+appdata_file_in = configure_file(
+          input: 'org.gnome.Builder.appdata.xml.in.in',
+         output: 'org.gnome.Builder.appdata.xml.in',
+  configuration: appdata_config,
+)
 appdata_file = i18n.merge_file(
-  input: 'org.gnome.Builder.appdata.xml.in',
-  output: 'org.gnome.Builder.appdata.xml',
-  po_dir: '../../po',
-  install: true,
+        input: appdata_file_in,
+       output: '@0  appdata xml'.format(app_id),
+       po_dir: '../../po',
+      install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo'),
 )
 
diff --git a/data/appdata/org.gnome.Builder.appdata.xml.in b/data/appdata/org.gnome.Builder.appdata.xml.in.in
similarity index 97%
rename from data/appdata/org.gnome.Builder.appdata.xml.in
rename to data/appdata/org.gnome.Builder.appdata.xml.in.in
index 14d14df69..1a45fb9b0 100644
--- a/data/appdata/org.gnome.Builder.appdata.xml.in
+++ b/data/appdata/org.gnome.Builder.appdata.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Igor Gnatenko <ignatenko src gnome org> -->
 <component type="desktop-application">
-  <id>org.gnome.Builder.desktop</id>
+  <id>@app_id@.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+ and GPL-2.0+ and LGPL-3.0+ and LGPL-2.0+ and MIT</project_license>
   <name>Builder</name>
@@ -71,7 +71,7 @@
       <image width="2664" 
height="1638">https://gitlab.gnome.org/GNOME/gnome-builder/raw/4aa3486375c618dc97f5477d42bf3674c44f7189/data/appdata/07-minimap.png</image>
     </screenshot>
   </screenshots>
-  <launchable type="desktop-id">org.gnome.Builder.desktop</launchable>
+  <launchable type="desktop-id">@app_id@.desktop</launchable>
   <url type="homepage">https://wiki.gnome.org/Apps/Builder</url>
   <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-builder/issues</url>
   <url type="donation">https://www.gnome.org/donate/</url>
@@ -90,7 +90,7 @@
   <translation type="gettext">gnome-builder</translation>
 
   <releases>
-    <release version="42.0" date="2022-03-18"/>
+    <release version="43.alpha0" date="2022-07-13"/>
   </releases>
 
   <content_rating type="oars-1.1">
diff --git a/data/meson.build b/data/meson.build
index ffe85249d..6a2d1902a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -5,10 +5,12 @@ subdir('icons')
 subdir('styles')
 
 # Desktop launcher and description file.
+desktop_file_config = configuration_data()
+desktop_file_config.set('app_id', app_id)
 desktop_file_in = configure_file(
           input: 'org.gnome.Builder.desktop.in.in',
          output: 'org.gnome.Builder.desktop.in',
-  configuration: config_h,
+  configuration: desktop_file_config,
 )
 desktop_file = i18n.merge_file(
         input: desktop_file_in,
@@ -26,7 +28,7 @@ endif
 
 # D-Bus service file.
 dbusconf = configuration_data()
-dbusconf.set('APP_ID', app_id)
+dbusconf.set('app_id', app_id)
 dbusconf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
 configure_file(
           input: 'org.gnome.Builder.service.in',
diff --git a/data/org.gnome.Builder.desktop.in.in b/data/org.gnome.Builder.desktop.in.in
index 171d517d4..69a863173 100644
--- a/data/org.gnome.Builder.desktop.in.in
+++ b/data/org.gnome.Builder.desktop.in.in
@@ -3,7 +3,7 @@ Name=Builder
 Comment=Build software for GNOME
 Exec=gnome-builder %U
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=@APP_ID@
+Icon=@app_id@
 DBusActivatable=true
 StartupNotify=true
 Terminal=false
diff --git a/data/org.gnome.Builder.service.in b/data/org.gnome.Builder.service.in
index 917dbfafc..ba809b766 100644
--- a/data/org.gnome.Builder.service.in
+++ b/data/org.gnome.Builder.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=@APP_ID@
+Name=@app_id@
 Exec=@bindir@/gnome-builder --gapplication-service