Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

th/build_meson_on_travis #54

Merged
merged 9 commits into from Jan 10, 2018
Merged

th/build_meson_on_travis #54

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ca94182
build/meson: rename config_plugin_ibft option to just ibft
thom311 Jan 10, 2018
2ad6976
build/meson: fix build with -D session_tracking=no -D systemdsystemun…
thom311 Jan 10, 2018
32e989b
build/meson: fix gir dependency with building without fake-typelibs
thom311 Jan 10, 2018
796df70
build/meson: fix build without introspection
thom311 Jan 10, 2018
3d7aa84
build/meson: disable unit tests that are known to fail
thom311 Jan 10, 2018
ec016f6
build/meson: fix build without have_version_script
thom311 Jan 10, 2018
349861c
build/meson: unconditionally use linker version scripts
thom311 Jan 10, 2018
5829970
travis: add meson builds to travis-ci
thom311 Jan 10, 2018
4bf77ea
travis: enable matrix build for gcc/clang and autotools/meson
thom311 Jan 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions meson.build
View file
Open in desktop
Expand Up @@ -240,9 +240,9 @@ endif

enable_ifcfg_rh = get_option('ifcfg_rh') or (distro == 'redhat')
enable_ifupdown = get_option('ifupdown') or (distro == 'debian')
enable_ibft = get_option('ibft') or enable_ifcfg_rh

enable_config_plugin_ibft = get_option('config_plugin_ibft')
config_h.set10('WITH_SETTINGS_PLUGIN_IBFT', enable_config_plugin_ibft)
config_h.set10('WITH_SETTINGS_PLUGIN_IBFT', enable_ibft)

config_plugins_default = get_option('config_plugins_default')
if config_plugins_default == ''
Expand All @@ -256,7 +256,7 @@ if config_plugins_default == ''
config_plugins += ['ifupdown']
endif

if enable_config_plugin_ibft
if enable_ibft
config_plugins += ['ibft']
endif

Expand Down Expand Up @@ -981,7 +981,7 @@ output += ' libnm-glib: ' + enable_libnm_glib.to_string() + '\n'
output += ' nmcli: ' + enable_nmcli.to_string() + '\n'
output += ' nmtui: ' + enable_nmtui.to_string() + '\n'
output += '\nConfiguration_plugins (main.plugins=' + config_plugins_default + ')\n'
output += ' ibft: ' + enable_config_plugin_ibft.to_string() + '\n'
output += ' ibft: ' + enable_ibft.to_string() + '\n'
output += ' ifcfg-rh: ' + enable_ifcfg_rh.to_string() + '\n'
output += ' ifupdown: ' + enable_ifupdown.to_string() + '\n'
output += '\nHandlers for /etc/resolv.conf:\n'
Expand Down
2 changes: 1 addition & 1 deletion meson_options.txt
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ option('bluez5_dun', type: 'boolean', value: false, description: 'enable Bluez5

# configuration plugins
option('config_plugins_default', type: 'string', value: '', description: 'Default configuration option for main.plugins setting, used as fallback if the configuration option is unset')
option('config_plugin_ibft', type: 'boolean', value: true, description: 'enable ibft configuration plugin')
option('ibft', type: 'boolean', value: false, description: 'enable ibft configuration plugin')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a couple whitespaces in front of type that would be nice to remove.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the white space is intentional, to vertically align with the neighbouring lines, that do something similar.

option('ifcfg_rh', type: 'boolean', value: false, description: 'enable ifcfg-rh configuration plugin (Fedora/RHEL)')
option('ifupdown', type: 'boolean', value: false, description: 'enable ifupdown configuration plugin (Debian/Ubuntu)')

Expand Down
8 changes: 4 additions & 4 deletions src/settings/plugins/meson.build
View file
Open in desktop
@@ -1,5 +1,5 @@
if enable_tests
subdir('keyfile/tests')
if enable_ibft
subdir('ibft')
endif

if enable_ifcfg_rh
Expand All @@ -10,6 +10,6 @@ if enable_ifupdown
subdir('ifupdown')
endif

if enable_config_plugin_ibft
subdir('ibft')
if enable_tests
subdir('keyfile/tests')
endif