diff options
| author | Marcus Lundblad <ml@update.uu.se> | 2021-10-18 23:04:25 +0200 |
|---|---|---|
| committer | Marcus Lundblad <ml@update.uu.se> | 2021-10-20 23:47:09 +0200 |
| commit | dfd8a5ddf2dd53dc5b08a976e693067636af6620 (patch) | |
| tree | ede29990f8b695fb5bff561db4be3858d45f4e30 /src | |
| parent | c929b320079c3b122a5f789c0f40b37c9b58fae2 (diff) | |
| download | gnome-maps-dfd8a5ddf2dd53dc5b08a976e693067636af6620.tar.gz | |
Set up dual installation supportwip/mlundblad/dual-installation
Add support for building dual-installable .Devel packages.
Based on an original WIP merge request by Bilal Elmoussaoui.
Diffstat (limited to 'src')
| -rw-r--r-- | src/application.js | 2 | ||||
| -rw-r--r-- | src/geoclue.js | 2 | ||||
| -rw-r--r-- | src/mainWindow.js | 5 | ||||
| -rw-r--r-- | src/meson.build | 14 | ||||
| -rw-r--r-- | src/org.gnome.Maps.src.gresource.xml.in (renamed from src/org.gnome.Maps.src.gresource.xml) | 2 |
5 files changed, 19 insertions, 6 deletions
diff --git a/src/application.js b/src/application.js index 32d309b0..5985c87c 100644 --- a/src/application.js +++ b/src/application.js @@ -96,7 +96,7 @@ var Application = GObject.registerClass({ /* Needed to be able to use in UI files */ _ensuredTypes.forEach((type) => GObject.type_ensure(type)); - super._init({ application_id: 'org.gnome.Maps', + super._init({ application_id: pkg.name, flags: Gio.ApplicationFlags.HANDLES_OPEN | Gio.ApplicationFlags.HANDLES_COMMAND_LINE }); this._connected = false; diff --git a/src/geoclue.js b/src/geoclue.js index 14f60ecb..864d9897 100644 --- a/src/geoclue.js +++ b/src/geoclue.js @@ -70,7 +70,7 @@ var Geoclue = GObject.registerClass({ } start(callback) { - let id = 'org.gnome.Maps'; + let id = pkg.name; let level = GClue.AccuracyLevel.EXACT; GClue.Simple.new(id, level, null, (object, result) => { diff --git a/src/mainWindow.js b/src/mainWindow.js index 08446e36..8c63faf3 100644 --- a/src/mainWindow.js +++ b/src/mainWindow.js @@ -112,6 +112,9 @@ var MainWindow = GObject.registerClass({ this._contextMenu = new ContextMenu.ContextMenu({ mapView: this._mapView, mainWindow: this }); + if (pkg.name.endsWith('.Devel')) + this.get_style_context().add_class('devel'); + this._initActions(); this._initHeaderbar(); this._initSignals(); @@ -592,7 +595,7 @@ var MainWindow = GObject.registerClass({ program_name: _("Maps"), comments: _("A map application for GNOME"), license_type: Gtk.License.GPL_2_0, - logo_icon_name: 'org.gnome.Maps', + logo_icon_name: pkg.name, version: pkg.version, website: 'https://live.gnome.org/Apps/Maps', wrap_license: true, diff --git a/src/meson.build b/src/meson.build index 49706a85..be7e6636 100644 --- a/src/meson.build +++ b/src/meson.build @@ -5,16 +5,26 @@ script_conf.set('libdir', libdir) script_conf.set('prefix', prefix) configure_file( - input: app_id + '.in', + input: 'org.gnome.Maps.in', output: app_id, configuration: script_conf, install: true, install_dir: pkgdatadir ) +sources_conf = configuration_data() +if (get_option('profile') == 'development') + sources_conf.set('suffix', '/Devel') +else + sources_conf.set('suffix', '') +endif gnome.compile_resources( app_id + '.src', - app_id + '.src.gresource.xml', + configure_file( + input: 'org.gnome.Maps.src.gresource.xml.in', + output: 'org.gnome.Maps.src.gresource.xml', + configuration: sources_conf + ), gresource_bundle: true, install: true, install_dir: pkgdatadir, diff --git a/src/org.gnome.Maps.src.gresource.xml b/src/org.gnome.Maps.src.gresource.xml.in index 70877dee..c4f10655 100644 --- a/src/org.gnome.Maps.src.gresource.xml +++ b/src/org.gnome.Maps.src.gresource.xml.in @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <gresources> - <gresource prefix="/org/gnome/Maps/js"> + <gresource prefix="/org/gnome/Maps@suffix@/js"> <file>accountListBox.js</file> <file>address.js</file> <file>application.js</file> |