Skip to content

Commit

Permalink
Replace default build options
Browse files Browse the repository at this point in the history
Instead of relying on build configuration, patch the default values in
our downstream meson_options with an Endless Key-specific app ID, as
well as environment variable and URI scheme prefixes.

#102
  • Loading branch information
dylanmccall committed Nov 24, 2023
1 parent d1ef583 commit 1232192
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
6 changes: 1 addition & 5 deletions build-aux/flatpak/org.endlessos.Key.Devel.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@
"builddir" : true,
"run-tests" : true,
"config-opts" : [
"-Dprofile=development",
"-Dbase_application_id=org.endlessos.Key",
"-Dbase_object_path=/org/endlessos/Key",
"-Denv_prefix=ENDLESS_KEY_",
"-Duri_prefix=x-endless-key"
"-Dprofile=development"
],
"sources" : [
{
Expand Down
8 changes: 4 additions & 4 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ option(
option(
'base_application_id',
type: 'string',
value: 'org.learningequality.Kolibri',
value: 'org.endlessos.Key',
description: 'Base application ID. When profile is "development", ".Devel" is appended'
)

option(
'base_object_path',
type: 'string',
value: '/org/learningequality/Kolibri',
value: '/org/endlessos/Key',
description: 'Base D-Bus object path. When profile is "development", "/Devel" is appended'
)

option(
'env_prefix',
type: 'string',
value: 'KOLIBRI_',
value: 'ENDLESS_KEY_',
description: 'Prefix for environment variables. When profile is "development", "DEVEL_" is appended'
)

option(
'uri_prefix',
type: 'string',
value: 'x-kolibri',
value: 'x-endless-key',
description: 'Prefix for custom URI schemes. When profile is "development", "-devel" is appended'
)

0 comments on commit 1232192

Please sign in to comment.