[eog/wip/gitlab-ci-v2] meson: Add switchable build profile and update application id
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog/wip/gitlab-ci-v2] meson: Add switchable build profile and update application id
- Date: Sun, 1 Dec 2019 16:59:57 +0000 (UTC)
commit ab5f3c2ee61363ddd9b71de876222bdf241797e6
Author: Felix Riemann <friemann gnome org>
Date: Sun Dec 1 17:24:48 2019 +0100
meson: Add switchable build profile and update application id
meson.build | 13 +++++++++++++
meson_options.txt | 1 +
src/eog-application.c | 4 +---
src/eog-window.c | 2 +-
4 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 9f262b5f..941970a0 100644
--- a/meson.build
+++ b/meson.build
@@ -42,8 +42,21 @@ cc = meson.get_compiler('c')
config_h = configuration_data()
+if get_option('profile') != 'default'
+ profile = 'Devel'
+ name_suffix = ' (Nightly)'
+ application_id = 'org.gnome.eog.' + profile
+else
+ profile = ''
+ name_suffix = ''
+ application_id = 'org.gnome.eog'
+endif
+
# defines
set_defines = [
+ # build profile
+ ['APPLICATION_ID', application_id],
+ ['PROFILE', profile],
# package
['PACKAGE', meson.project_name()],
['VERSION', eog_version],
diff --git a/meson_options.txt b/meson_options.txt
index ce0d9248..85052536 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,3 +6,4 @@ option('librsvg', type: 'boolean', value: true, description: 'enable RSVG suppor
option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
option('introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection (depends on
GObject)')
option('installed_tests', type: 'boolean', value: false, description: 'enable installed unit tests')
+option('profile', type: 'combo', choices: ['default', 'Devel'], value: 'default', description: 'Build
profile')
diff --git a/src/eog-application.c b/src/eog-application.c
index 63207d08..5383277e 100644
--- a/src/eog-application.c
+++ b/src/eog-application.c
@@ -49,8 +49,6 @@
#include <exempi/xmp.h>
#endif
-#define APPLICATION_SERVICE_NAME "org.gnome.eog.ApplicationService"
-
static void eog_application_load_accelerators (void);
static void eog_application_save_accelerators (void);
@@ -473,7 +471,7 @@ eog_application_get_instance (void)
if (!instance) {
instance = EOG_APPLICATION (g_object_new (EOG_TYPE_APPLICATION,
- "application-id", APPLICATION_SERVICE_NAME,
+ "application-id", APPLICATION_ID,
"flags", G_APPLICATION_HANDLES_OPEN,
NULL));
}
diff --git a/src/eog-window.c b/src/eog-window.c
index 7fd2fd83..d1db695b 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -5573,7 +5573,7 @@ eog_window_show_about_dialog (EogWindow *window)
"documenters", documenters,
"translator-credits", _("translator-credits"),
"website", "https://wiki.gnome.org/Apps/EyeOfGnome",
- "logo-icon-name", "org.gnome.eog",
+ "logo-icon-name", APPLICATION_ID,
"wrap-license", TRUE,
"license-type", GTK_LICENSE_GPL_2_0,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]