Allow for parallel development instance

This adds a configuration option in meson, if set it changes the
application ID allowing for stable and development version to be
run at the same time.
This commit is contained in:
Jordan Petridis
2018-08-28 17:22:13 +03:00
parent 15457e1db4
commit 569c00ff5f
16 changed files with 121 additions and 44 deletions
+1 -2
View File
@@ -81,13 +81,12 @@ Tobias Bernard
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage">
<object class="GtkImage" id="image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="pixel_size">256</property>
<property name="icon_name">org.gnome.Podcasts-symbolic</property>
<style>
<class name="dim-label"/>
</style>
+12
View File
@@ -17,4 +17,16 @@ list, border {
.player-show-label {
font-size: smaller;
}
.devel headerbar {
background: transparent -gtk-icontheme("system-run-symbolic") 80% 0/128px 128px no-repeat,
linear-gradient(to left,
mix(@theme_selected_bg_color, @theme_bg_color, 0.5) 8%,
@theme_bg_color 25%);
color: alpha(@theme_fg_color, 0.1);
}
.devel headerbar label {
color: @theme_fg_color;
}
+15 -1
View File
@@ -1 +1,15 @@
install_subdir('hicolor', install_dir: icondir)
scalable_dir = join_paths('hicolor', 'scalable', 'apps')
install_data(
join_paths(scalable_dir, 'org.gnome.Podcasts.svg'),
install_dir: join_paths(datadir, 'icons', scalable_dir),
rename: '@0@.svg'.format(application_id)
)
symbolic_dir = join_paths('hicolor', 'symbolic', 'apps')
install_data(
join_paths(symbolic_dir, 'org.gnome.Podcasts-symbolic.svg'),
install_dir: join_paths(datadir, 'icons', symbolic_dir),
rename: '@0@-symbolic.svg'.format(application_id)
)
+23 -9
View File
@@ -1,27 +1,41 @@
subdir('icons')
desktop_conf = configuration_data()
desktop_conf.set('icon', application_id)
i18n.merge_file ('desktop-file',
type: 'desktop',
input: 'org.gnome.Podcasts.desktop.in',
output: 'org.gnome.Podcasts.desktop',
input: configure_file(
input: files('org.gnome.Podcasts.desktop.in.in'),
output: 'org.gnome.Podcasts.desktop.in',
configuration: desktop_conf
),
output: '@0@.desktop'.format(application_id),
po_dir: podir,
install: true,
install_dir: join_paths (datadir, 'applications')
)
appdata_conf = configuration_data()
appdata_conf.set('appid', application_id)
i18n.merge_file ('appdata-file',
input: 'org.gnome.Podcasts.appdata.xml.in',
output: 'org.gnome.Podcasts.appdata.xml',
input: configure_file(
input: files('org.gnome.Podcasts.appdata.xml.in.in'),
output: 'org.gnome.Podcasts.appdata.xml.in',
configuration: appdata_conf
),
output: '@0@.appdata.xml'.format(application_id),
po_dir: podir,
install: true,
install_dir: join_paths (datadir, 'appdata')
install_dir: join_paths (datadir, 'metainfo')
)
install_data('org.gnome.Podcasts.gschema.xml', install_dir: join_paths(datadir, 'glib-2.0', 'schemas'))
configure_file(input: 'org.gnome.Podcasts.service.in',
output: 'org.gnome.Podcasts.service',
configuration: podcasts_conf,
install_dir: join_paths([datadir,'dbus-1/services']))
configure_file(
input: 'org.gnome.Podcasts.service.in',
output: '@0@.service'.format(application_id),
configuration: podcasts_conf,
install_dir: join_paths(datadir,'dbus-1', 'services')
)
meson.add_install_script('../../scripts/compile-gschema.py')
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>org.gnome.Podcasts</id>
<id>@appid@</id>
<name>Podcasts</name>
<project_license>GPL-3.0</project_license>
<metadata_license>CC0-1.0</metadata_license>
@@ -2,7 +2,7 @@
Name=Podcasts
Comment=Listen to your favorite podcasts, right from your desktop.
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=org.gnome.Podcasts
Icon=@icon@
Exec=gnome-podcasts
Terminal=false
Type=Application
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.gnome.Podcasts
Exec=@BINDIR@/gnome-podcasts --gapplication-service
Name=@appid@
Exec=@bindir@/gnome-podcasts --gapplication-service