Re: [igt-dev] [PATCH i-g-t] build: rename Meson options

[Arkadiusz Hiler <arkadiusz.hiler@intel.com>]

On Fri, Jul 05, 2019 at 04:45:33PM +0300, Simon Ser wrote:
> Meson emits a warning because we use options beginning with "build_":
> 
>     DEPRECATION: Option uses prefix "build_", which is reserved for Meson. This will become an error in the future.
> 
> Rename our options so that we don't use the Meson-reserved prefix.
> 
> While at it, also make other build options and descriptions more consistent.
> 
> Signed-off-by: Simon Ser <simon.ser@intel.com>
> ---
> 
> Suggestions to further improve our build options are welcome.
> 
>  man/meson.build     |  2 +-
>  meson.build         | 12 ++++++------
>  meson_options.txt   | 30 +++++++++++++++---------------
>  overlay/meson.build |  2 +-
>  runner/meson.build  |  2 +-
>  5 files changed, 24 insertions(+), 24 deletions(-)
> 
> diff --git a/man/meson.build b/man/meson.build
> index 2c1396af2738..2187e8c505c1 100644
> --- a/man/meson.build
> +++ b/man/meson.build
> @@ -1,4 +1,4 @@
> -build_man = get_option('build_man')
> +build_man = get_option('man')
> 
>  manpages = [
>  	'intel_aubdump',
> diff --git a/meson.build b/meson.build
> index f0cb2543ca64..5d32efd33933 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -77,10 +77,10 @@ foreach cc_arg : cc_args
>    endif
>  endforeach
> 
> -build_chamelium = get_option('build_chamelium')
> -build_docs = get_option('build_docs')
> -build_tests = not get_option('build_tests').disabled()
> -with_libdrm = get_option('with_libdrm')
> +build_chamelium = get_option('chamelium')
> +build_docs = get_option('docs')
> +build_tests = not get_option('tests').disabled()
> +with_libdrm = get_option('libdrm_drivers')
> 
>  build_info = ['Build type: ' + get_option('buildtype')]
> 
> @@ -118,13 +118,13 @@ pciaccess = dependency('pciaccess', version : '>=0.10')
>  libkmod = dependency('libkmod')
>  libprocps = dependency('libprocps', required : true)
> 
> -libunwind = dependency('libunwind', required : get_option('with_libunwind'))
> +libunwind = dependency('libunwind', required : get_option('libunwind'))
>  build_info += 'With libunwind: @0@'.format(libunwind.found())
> 
>  libdw = dependency('libdw', required : true)
>  pixman = dependency('pixman-1', required : true)
> 
> -valgrind = dependency('valgrind', required : get_option('with_valgrind'))
> +valgrind = dependency('valgrind', required : get_option('valgrind'))
>  if valgrind.found()
>  	config.set('HAVE_VALGRIND', 1)
>  endif
> diff --git a/meson_options.txt b/meson_options.txt
> index 9cca0c4f47eb..f980d3e005a6 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -1,6 +1,6 @@
> -option('build_overlay',
> +option('overlay',
>         type : 'feature',
> -       description : 'Build overlay')
> +       description : 'Tools: overlay')
> 
>  option('overlay_backends',
>         type : 'array',
> @@ -8,39 +8,39 @@ option('overlay_backends',
>         choices : [ 'auto', 'x', 'xv' ],
>         description : 'Overlay backends to enable')
> 
> -option('build_chamelium',
> +option('chamelium',
>         type : 'feature',
> -       description : 'Build chamelium test')
> +       description : 'Tests: Chamelium')
> 
> -option('with_valgrind',
> +option('valgrind',
>         type : 'feature',
>         description : 'Build with support for valgrind annotations')
> 
> -option('build_man',
> +option('man',
>         type : 'feature',
> -       description : 'Build man pages')
> +       description : 'Man pages')
> 
> -option('build_docs',
> +option('docs',
>         type : 'feature',
> -       description : 'Build documentation')
> +       description : 'Documentation')
> 
> -option('build_tests',
> +option('tests',
>         type : 'feature',
> -       description : 'Build tests')
> +       description : 'Tests')
> 
> -option('with_libdrm',
> +option('libdrm_drivers',
>         type : 'array',
>         value : ['auto'],
>         choices : ['', 'auto', 'intel', 'nouveau', 'amdgpu'],
>         description : 'libdrm libraries to be used')
> 
> -option('with_libunwind',
> +option('libunwind',
>         type : 'feature',
>         description : 'Use libunwind')
> 
> -option('build_runner',
> +option('runner',
>         type : 'feature',
> -       description : 'Build test runner')
> +       description : 'Test runner')


Seems like this uncovered a mistake in test-fedora-no-libunwind:
   meson -Dlibunwind=false build

It wasn't even an option. Can we make meson complain on unknown -D?

Also, I think I would keep "build" in descriptions if the switch manages
building of the optional part of IGT.

-- 
Cheers,
Arek

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev