public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: igt-dev@lists.freedesktop.org, Petri Latvala <petri.latvala@intel.com>
Subject: Re: [igt-dev] [PATCH i-g-t 2/2] docs/meson: Remove the hax for meson < 0.47
Date: Thu, 23 May 2019 10:58:29 +0200	[thread overview]
Message-ID: <20190523085829.GZ21222@phenom.ffwll.local> (raw)
In-Reply-To: <20190521093602.11777-2-arkadiusz.hiler@intel.com>

On Tue, May 21, 2019 at 12:36:02PM +0300, Arkadiusz Hiler wrote:
> With updated minimum required version to 0.47.0 it is no longer needed.
> 
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  docs/reference/igt-gpu-tools/meson.build | 41 +++++++-----------------
>  1 file changed, 11 insertions(+), 30 deletions(-)
> 
> diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
> index b2b2c1c2..4d177e49 100644
> --- a/docs/reference/igt-gpu-tools/meson.build
> +++ b/docs/reference/igt-gpu-tools/meson.build
> @@ -54,37 +54,18 @@ configure_file(input: 'version.xml.in',
>  	       output: 'version.xml',
>  	       install: false, configuration: config)
>  
> -if meson.version().version_compare('>= 0.47')
> -	foreach group : test_groups
> -		programs_xml = 'igt_test_programs_' + group + '_programs.xml'
> -		generated_docs += custom_target(programs_xml,
> -			      output : programs_xml,
> -			      command : [ gen_programs, '@OUTPUT@', group, test_list_target ])
> +foreach group : test_groups
> +	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
> +	generated_docs += custom_target(programs_xml,
> +		      output : programs_xml,
> +		      command : [ gen_programs, '@OUTPUT@', group, test_list_target ])
>  
> -		description_xml = 'igt_test_programs_' + group + '_description.xml'
> -		generated_docs += custom_target(description_xml,
> -			      output : description_xml,
> -			      depends : test_executables,
> -			      command : [ gen_description, '@OUTPUT@', group, test_list_target ])
> -	endforeach
> -else
> -	# older meson needs the build_by_default hack because gtkdoc dependency
> -	# handling is broken
> -	foreach group : test_groups
> -		programs_xml = 'igt_test_programs_' + group + '_programs.xml'
> -		custom_target(programs_xml,
> -			      build_by_default : true,
> -			      output : programs_xml,
> -			      command : [ gen_programs, '@OUTPUT@', group, test_list_target ])
> -
> -		description_xml = 'igt_test_programs_' + group + '_description.xml'
> -		custom_target(description_xml,
> -			      build_by_default : true,
> -			      output : description_xml,
> -			      depends : test_executables,
> -			      command : [ gen_description, '@OUTPUT@', group, test_list_target ])
> -	endforeach
> -endif
> +	description_xml = 'igt_test_programs_' + group + '_description.xml'
> +	generated_docs += custom_target(description_xml,
> +		      output : description_xml,
> +		      depends : test_executables,
> +		      command : [ gen_description, '@OUTPUT@', group, test_list_target ])
> +endforeach
>  
>  gnome.gtkdoc('igt-gpu-tools',
>  	     content_files : ['igt_test_programs.xml'] + generated_docs,
> -- 
> 2.21.0
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  reply	other threads:[~2019-05-23  8:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-21  9:36 [igt-dev] [PATCH i-g-t 1/2] meson: Start using 'feature' options Arkadiusz Hiler
2019-05-21  9:36 ` [igt-dev] [PATCH i-g-t 2/2] docs/meson: Remove the hax for meson < 0.47 Arkadiusz Hiler
2019-05-23  8:58   ` Daniel Vetter [this message]
2019-05-21 10:47 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] meson: Start using 'feature' options Patchwork
2019-05-21 15:25 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-05-23  8:57 ` [igt-dev] [PATCH i-g-t 1/2] " Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190523085829.GZ21222@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=arkadiusz.hiler@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=petri.latvala@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox