[meld/flatpak-ci: 28/31] Make most resources load from the resource (not application) base



commit 095b46c24f91e2ed830573afb8244021210a224f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Nov 17 06:27:33 2019 +1000

    Make most resources load from the resource (not application) base
    
    While this seems slightly weird, the idea here is that unlike the
    application ID, what we've called the resource base is stable between
    profiles, so is what we should use for in-repo filenames. Maybe this
    should be broken out into yet another variable, but we'll see how we go.

 data/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index acfdcf43..ef5f3884 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,7 +7,7 @@ install_data(
 
 # Install schema file
 install_data(
-  '@0  gschema xml'.format(application_id),
+  '@0  gschema xml'.format(resource_base_id),
   install_dir: schemadir
 )
 
@@ -40,7 +40,7 @@ endif
 
 # Install AppData file
 appdata_file = i18n.merge_file(
-  input: '@0  appdata xml in'.format(application_id),
+  input: '@0  appdata xml in'.format(resource_base_id),
   output: '@0  appdata xml'.format(application_id),
   po_dir: podir,
   install: true,
@@ -63,7 +63,7 @@ endif
 
 # Install mimetypes
 mimetype_file = i18n.merge_file(
-  input: join_paths('mime', '@0  xml in'.format(application_id)),
+  input: join_paths('mime', '@0  xml in'.format(resource_base_id)),
   output: '@0@.xml'.format(application_id),
   po_dir: podir,
   data_dirs: itsdir,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]