Use C Macro for embedding application ID

Changes

5 changed files (+13/-4)

• build.zig
  • @@ -56,6 +56,12 @@ pub fn build(b: *std.Build) !void {
    "Application version. Defaults to `version` field in \"build.zig.zon\".", ) orelse zon.version; + const app_id = b.option( + []const u8, + "app-id", + b.fmt("Application ID. Defaults to \"{s}\"", .{app_name}), + ) orelse app_name; + const compile_gschema = b.option(bool, "compile-gschema", "Compile gschema XML file for local run") orelse false; // System libraries to link.
  • @@ -147,6 +153,7 @@ pub fn build(b: *std.Build) !void {
    }); exe.root_module.addCMacro("PLAC_APP_VERSION", b.fmt("\"{s}\"", .{version})); + exe.root_module.addCMacro("PLAC_APP_ID", b.fmt("\"{s}\"", .{app_id})); // Vala does not bundle system libraries (of course): we have to tell the // linker.
• src/Application.vala
  • @@ -35,7 +35,7 @@ namespace PlacGtkAdwaita {
    public App(){ Object( - application_id: "jp.pocka.plac.gtk-adwaita", + application_id: Config.PLAC_APP_ID, flags : ApplicationFlags.DEFAULT_FLAGS ); }
• src/Config.vapi
  • @@ -15,6 +15,9 @@
    // SPDX-License-Identifier: Apache-2.0 namespace Config { + [CCode (cname = "PLAC_APP_ID")] + public const string PLAC_APP_ID; + [CCode (cname = "PLAC_APP_VERSION")] public const string PLAC_APP_VERSION; }
• src/Settings.vala
  • @@ -28,7 +28,7 @@ namespace PlacGtkAdwaita {
    public GLib.Settings settings; public Settings() { - settings = new GLib.Settings("jp.pocka.plac.gtk-adwaita"); + settings = new GLib.Settings(Config.PLAC_APP_ID); } public string connected_server_id {
• src/Windows/MainWindow.vala
  • @@ -169,8 +169,7 @@ namespace PlacGtkAdwaita {
    playback_toolbar.visible = false; var req = new Roon.Registry.Register.Request(); - // TODO: Configure these via build parameters - req.extension_id = "jp.pocka.plac.gtk-adwaita"; + req.extension_id = Config.PLAC_APP_ID; req.display_name = "Plac for GTK"; req.display_version = Config.PLAC_APP_VERSION; req.publisher = "Shota FUJI";