Skip to content

Commit

Permalink
Meson Project: some optimizations
Browse files Browse the repository at this point in the history
 * data/meson.build: remove redundant configuration data
 * meson_options.txt: use `deprecated` as option name to match Gnome
   Guidelines.
  • Loading branch information
vaurelios authored and raveit65 committed Sep 3, 2020
1 parent 69870bb commit c0c3650
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
19 changes: 6 additions & 13 deletions data/meson.build
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
preferences_desktop_data = configuration_data()
preferences_desktop_data.set('VERSION', meson.project_version())
common_desktop_data = configuration_data()
common_desktop_data.set('VERSION', meson.project_version())

preferences_desktop = configure_file(
input: 'mate-power-preferences.desktop.in.in',
output: 'mate-power-preferences.desktop.in',
configuration: preferences_desktop_data
configuration: common_desktop_data
)

statistics_desktop_data = configuration_data()
statistics_desktop_data.set('VERSION', meson.project_version())

statistics_desktop = configure_file(
input: 'mate-power-statistics.desktop.in.in',
output: 'mate-power-statistics.desktop.in',
configuration: statistics_desktop_data
configuration: common_desktop_data
)

mpm_autostart_data = configuration_data()
mpm_autostart_data.set('VERSION', meson.project_version())

mpm_autostart = configure_file(
input: 'mate-power-manager.desktop.in.in',
output: 'mate-power-manager.desktop.in',
configuration: mpm_autostart_data
configuration: common_desktop_data
)

mpm_service_data = configuration_data()
Expand Down Expand Up @@ -81,8 +75,7 @@ install_man(
'mate-power-backlight-helper.1',
'mate-power-statistics.1',
'mate-power-preferences.1'
],
install_dir: mandir_path
]
)

install_data(
Expand Down
2 changes: 1 addition & 1 deletion meson_options.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option('enable-deprecated', type: 'boolean', value: false, description: 'Warn about deprecated usages')
option('deprecated', type: 'boolean', value: false, description: 'Warn about deprecated usages')
option('keyring', type: 'feature', value: 'auto', description: 'Enable the use of gnome-keyring')
option('applets', type: 'feature', value: 'enabled', description: 'Build the extra power applets')
option('with-dbus-services', type: 'string', description: 'where D-BUS services directory is')

0 comments on commit c0c3650

Please sign in to comment.