[igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Daniel Vetter]

meson 0.45 properly supports generated content_files. Except for the
minor issue that we're hitting an internal bug in meson. I've made a
pull request for that, but this needs more work:

https://github.com/mesonbuild/meson/pull/3189

Downside of this all is that we'd need to up the meson requirements to
something like 0.46, at least if you want to build the docs.

Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 docs/reference/intel-gpu-tools/meson.build | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/reference/intel-gpu-tools/meson.build b/docs/reference/intel-gpu-tools/meson.build
index 1c009229aae2..5f6646eb8fa2 100644
--- a/docs/reference/intel-gpu-tools/meson.build
+++ b/docs/reference/intel-gpu-tools/meson.build
@@ -50,17 +50,17 @@ gen_programs = find_program('generate_programs_xml.sh')
 
 test_list_files = []
 
+generated_docs = []
+
 foreach group : test_groups
 	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
-	custom_target(programs_xml,
+	generated_docs += custom_target(programs_xml,
 		      output : programs_xml,
-		      build_by_default : true,
 		      command : [ gen_programs, '@OUTPUT@', group, test_list ])
 
 	description_xml = 'igt_test_programs_' + group + '_description.xml'
-	custom_target(description_xml,
+	generated_docs += custom_target(description_xml,
 		      output : description_xml,
-		      build_by_default : true,
 		      depends : test_executables,
 		      command : [ gen_description, '@OUTPUT@', group, test_list ])
 endforeach
@@ -70,7 +70,7 @@ configure_file(input: 'version.xml.in',
 	       install: false, configuration: config)
 
 gnome.gtkdoc('intel-gpu-tools',
-	     content_files : ['igt_test_programs.xml'],
+	     content_files : ['igt_test_programs.xml'] + generated_docs,
 	     dependencies : lib_igt,
 	     install : true,
 	     main_xml : 'intel-gpu-tools-docs.xml',
-- 
2.15.1

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

[igt-dev] ✓ Fi.CI.BAT: success for gtkdoc: Remove the build_by_default hack

[Patchwork]

== Series Details ==

Series: gtkdoc: Remove the build_by_default hack
URL   : https://patchwork.freedesktop.org/series/39455/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
b4689dce36d0fbd9aec70d5a4b077c43a6b9c254 igt: Remove gen7_forcewake_mt

with latest DRM-Tip kernel build CI_DRM_3880
3d35bb0a8966 drm-tip: 2018y-03m-06d-12h-23m-04s UTC integration manifest

No testlist changes.

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:424s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:428s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:373s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:510s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:282s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:491s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:492s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:483s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:471s
fi-cfl-8700k     total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:408s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:573s
fi-cnl-y3        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:593s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:418s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:293s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:520s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:399s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:410s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:466s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:419s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:470s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:461s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:504s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:589s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:438s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:521s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:533s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:501s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:484s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:426s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:512s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:395s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1071/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.IGT: failure for gtkdoc: Remove the build_by_default hack

[Patchwork]

== Series Details ==

Series: gtkdoc: Remove the build_by_default hack
URL   : https://patchwork.freedesktop.org/series/39455/
State : failure

== Summary ==

---- Possible new issues:

Test kms_cursor_legacy:
        Subgroup short-flip-before-cursor-atomic-transitions:
                pass       -> FAIL       (shard-hsw)

---- Known issues:

Test gem_eio:
        Subgroup in-flight:
                incomplete -> PASS       (shard-apl) fdo#105341
Test gem_softpin:
        Subgroup noreloc-s3:
                skip       -> PASS       (shard-snb) fdo#103375
Test kms_chv_cursor_fail:
        Subgroup pipe-b-64x64-right-edge:
                pass       -> DMESG-WARN (shard-snb) fdo#105185 +1
Test kms_flip:
        Subgroup flip-vs-expired-vblank:
                fail       -> PASS       (shard-hsw) fdo#102887 +1
        Subgroup plain-flip-ts-check:
                pass       -> FAIL       (shard-hsw) fdo#100368 +2
Test kms_frontbuffer_tracking:
        Subgroup fbc-suspend:
                fail       -> PASS       (shard-apl) fdo#101623
Test kms_plane:
        Subgroup plane-panning-bottom-right-suspend-pipe-b-planes:
                incomplete -> PASS       (shard-hsw) fdo#103540
Test kms_rotation_crc:
        Subgroup sprite-rotation-90-pos-100-0:
                dmesg-warn -> PASS       (shard-apl) fdo#103356
Test kms_sysfs_edid_timing:
                warn       -> PASS       (shard-apl) fdo#100047

fdo#105341 https://bugs.freedesktop.org/show_bug.cgi?id=105341
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103356 https://bugs.freedesktop.org/show_bug.cgi?id=103356
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047

shard-apl        total:3463 pass:1824 dwarn:1   dfail:0   fail:7   skip:1630 time:11676s
shard-hsw        total:3467 pass:1768 dwarn:1   dfail:0   fail:6   skip:1691 time:11804s
shard-snb        total:3467 pass:1363 dwarn:2   dfail:0   fail:2   skip:2100 time:7094s
Blacklisted hosts:
shard-kbl        total:3463 pass:1934 dwarn:15  dfail:0   fail:8   skip:1505 time:8862s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1071/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Eric Anholt]

[-- Attachment #1.1: Type: text/plain, Size: 568 bytes --]

Daniel Vetter <daniel.vetter@ffwll.ch> writes:

> meson 0.45 properly supports generated content_files. Except for the
> minor issue that we're hitting an internal bug in meson. I've made a
> pull request for that, but this needs more work:
>
> https://github.com/mesonbuild/meson/pull/3189
>
> Downside of this all is that we'd need to up the meson requirements to
> something like 0.46, at least if you want to build the docs.

What's the status of this?  I just pulled this to my vc5 dev branch so
that builds don't take ages, and it seems to have fixed it for me.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

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

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Daniel Vetter]

On Wed, Apr 4, 2018 at 8:39 PM, Eric Anholt <eric@anholt.net> wrote:
> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
>> meson 0.45 properly supports generated content_files. Except for the
>> minor issue that we're hitting an internal bug in meson. I've made a
>> pull request for that, but this needs more work:
>>
>> https://github.com/mesonbuild/meson/pull/3189
>>
>> Downside of this all is that we'd need to up the meson requirements to
>> something like 0.46, at least if you want to build the docs.
>
> What's the status of this?  I just pulled this to my vc5 dev branch so
> that builds don't take ages, and it seems to have fixed it for me.

I need to revise the meson pull to include a proper regression test.
Which I didn't find time for yet. Then we need to wait until that
meson is released and in enough distros, and then we can merge this
patch. As-is, with unpatched meson, this patch breaks the docs build.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Petri Latvala]

On Thu, Apr 05, 2018 at 08:22:11AM +0200, Daniel Vetter wrote:
> On Wed, Apr 4, 2018 at 8:39 PM, Eric Anholt <eric@anholt.net> wrote:
> > Daniel Vetter <daniel.vetter@ffwll.ch> writes:
> >> meson 0.45 properly supports generated content_files. Except for the
> >> minor issue that we're hitting an internal bug in meson. I've made a
> >> pull request for that, but this needs more work:
> >>
> >> https://github.com/mesonbuild/meson/pull/3189
> >>
> >> Downside of this all is that we'd need to up the meson requirements to
> >> something like 0.46, at least if you want to build the docs.
> >
> > What's the status of this?  I just pulled this to my vc5 dev branch so
> > that builds don't take ages, and it seems to have fixed it for me.
> 
> I need to revise the meson pull to include a proper regression test.
> Which I didn't find time for yet. Then we need to wait until that
> meson is released and in enough distros, and then we can merge this
> patch.

Elaborating on this: The highest meson version we can realistically
require is the one used in Debian stable.


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

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Daniel Vetter]

On Thu, Apr 05, 2018 at 11:35:16AM +0300, Petri Latvala wrote:
> On Thu, Apr 05, 2018 at 08:22:11AM +0200, Daniel Vetter wrote:
> > On Wed, Apr 4, 2018 at 8:39 PM, Eric Anholt <eric@anholt.net> wrote:
> > > Daniel Vetter <daniel.vetter@ffwll.ch> writes:
> > >> meson 0.45 properly supports generated content_files. Except for the
> > >> minor issue that we're hitting an internal bug in meson. I've made a
> > >> pull request for that, but this needs more work:
> > >>
> > >> https://github.com/mesonbuild/meson/pull/3189
> > >>
> > >> Downside of this all is that we'd need to up the meson requirements to
> > >> something like 0.46, at least if you want to build the docs.
> > >
> > > What's the status of this?  I just pulled this to my vc5 dev branch so
> > > that builds don't take ages, and it seems to have fixed it for me.
> > 
> > I need to revise the meson pull to include a proper regression test.
> > Which I didn't find time for yet. Then we need to wait until that
> > meson is released and in enough distros, and then we can merge this
> > patch.
> 
> Elaborating on this: The highest meson version we can realistically
> require is the one used in Debian stable.

Debian stable is too much imo, but it needs to be released and shipping in
some distros at least.
-Daniel
-- 
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

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Jani Nikula]

On Thu, 05 Apr 2018, Petri Latvala <petri.latvala@intel.com> wrote:
> On Thu, Apr 05, 2018 at 08:22:11AM +0200, Daniel Vetter wrote:
>> On Wed, Apr 4, 2018 at 8:39 PM, Eric Anholt <eric@anholt.net> wrote:
>> > Daniel Vetter <daniel.vetter@ffwll.ch> writes:
>> >> meson 0.45 properly supports generated content_files. Except for the
>> >> minor issue that we're hitting an internal bug in meson. I've made a
>> >> pull request for that, but this needs more work:
>> >>
>> >> https://github.com/mesonbuild/meson/pull/3189
>> >>
>> >> Downside of this all is that we'd need to up the meson requirements to
>> >> something like 0.46, at least if you want to build the docs.
>> >
>> > What's the status of this?  I just pulled this to my vc5 dev branch so
>> > that builds don't take ages, and it seems to have fixed it for me.
>> 
>> I need to revise the meson pull to include a proper regression test.
>> Which I didn't find time for yet. Then we need to wait until that
>> meson is released and in enough distros, and then we can merge this
>> patch.
>
> Elaborating on this: The highest meson version we can realistically
> require is the one used in Debian stable.

The 0.37 in Debian stable is basically unusable, and not recommended by
upstream IIUC. Current required version in igt seems to be 0.40 as well.
Debian stable-backports has 0.42 which I think is reasonable.

I think requiring the most bleeding edge versions of the build tools
will harm the wider adoption. I think you'll want more people switching
to meson, not fewer.

BR,
Jani.


-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Eric Anholt]

[-- Attachment #1.1: Type: text/plain, Size: 1138 bytes --]

Daniel Vetter <daniel.vetter@ffwll.ch> writes:

> On Wed, Apr 4, 2018 at 8:39 PM, Eric Anholt <eric@anholt.net> wrote:
>> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
>>> meson 0.45 properly supports generated content_files. Except for the
>>> minor issue that we're hitting an internal bug in meson. I've made a
>>> pull request for that, but this needs more work:
>>>
>>> https://github.com/mesonbuild/meson/pull/3189
>>>
>>> Downside of this all is that we'd need to up the meson requirements to
>>> something like 0.46, at least if you want to build the docs.
>>
>> What's the status of this?  I just pulled this to my vc5 dev branch so
>> that builds don't take ages, and it seems to have fixed it for me.
>
> I need to revise the meson pull to include a proper regression test.
> Which I didn't find time for yet. Then we need to wait until that
> meson is released and in enough distros, and then we can merge this
> patch. As-is, with unpatched meson, this patch breaks the docs build.

Ping - the upstream PR is closed, but I can't tell if 0.46 is usable
yet.  I'm still carrying this patch in my trees so I can cross compile.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

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

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Daniel Vetter]

On Mon, Jun 04, 2018 at 02:07:21PM -0700, Eric Anholt wrote:
> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
> 
> > On Wed, Apr 4, 2018 at 8:39 PM, Eric Anholt <eric@anholt.net> wrote:
> >> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
> >>> meson 0.45 properly supports generated content_files. Except for the
> >>> minor issue that we're hitting an internal bug in meson. I've made a
> >>> pull request for that, but this needs more work:
> >>>
> >>> https://github.com/mesonbuild/meson/pull/3189
> >>>
> >>> Downside of this all is that we'd need to up the meson requirements to
> >>> something like 0.46, at least if you want to build the docs.
> >>
> >> What's the status of this?  I just pulled this to my vc5 dev branch so
> >> that builds don't take ages, and it seems to have fixed it for me.
> >
> > I need to revise the meson pull to include a proper regression test.
> > Which I didn't find time for yet. Then we need to wait until that
> > meson is released and in enough distros, and then we can merge this
> > patch. As-is, with unpatched meson, this patch breaks the docs build.
> 
> Ping - the upstream PR is closed, but I can't tell if 0.46 is usable
> yet.  I'm still carrying this patch in my trees so I can cross compile.

Sry I dropped the ball on this completely, and somehow also didn't see the
update that my github pull request got closed.

The fix indeed works, but it's not even yet in a released version of
meson, only in 0.47-dev. Bit aggressive to require that from developers
and CI ...

I'll resend the patch meanwhile with those bits updated.
-Daniel
-- 
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

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Eric Anholt]

[-- Attachment #1.1: Type: text/plain, Size: 1756 bytes --]

Daniel Vetter <daniel@ffwll.ch> writes:

> On Mon, Jun 04, 2018 at 02:07:21PM -0700, Eric Anholt wrote:
>> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
>> 
>> > On Wed, Apr 4, 2018 at 8:39 PM, Eric Anholt <eric@anholt.net> wrote:
>> >> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
>> >>> meson 0.45 properly supports generated content_files. Except for the
>> >>> minor issue that we're hitting an internal bug in meson. I've made a
>> >>> pull request for that, but this needs more work:
>> >>>
>> >>> https://github.com/mesonbuild/meson/pull/3189
>> >>>
>> >>> Downside of this all is that we'd need to up the meson requirements to
>> >>> something like 0.46, at least if you want to build the docs.
>> >>
>> >> What's the status of this?  I just pulled this to my vc5 dev branch so
>> >> that builds don't take ages, and it seems to have fixed it for me.
>> >
>> > I need to revise the meson pull to include a proper regression test.
>> > Which I didn't find time for yet. Then we need to wait until that
>> > meson is released and in enough distros, and then we can merge this
>> > patch. As-is, with unpatched meson, this patch breaks the docs build.
>> 
>> Ping - the upstream PR is closed, but I can't tell if 0.46 is usable
>> yet.  I'm still carrying this patch in my trees so I can cross compile.
>
> Sry I dropped the ball on this completely, and somehow also didn't see the
> update that my github pull request got closed.
>
> The fix indeed works, but it's not even yet in a released version of
> meson, only in 0.47-dev. Bit aggressive to require that from developers
> and CI ...
>
> I'll resend the patch meanwhile with those bits updated.

Thanks, I guess I can put up with a bit more out of tree.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

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

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Petri Latvala]

On Tue, Jun 19, 2018 at 08:47:37AM +0200, Daniel Vetter wrote:
> meson 0.45 properly supports generated content_files. Except for the
> minor issue that we're hitting an internal bug in meson. I've made a
> pull request for that
> 
> https://github.com/mesonbuild/meson/pull/3189
> 
> which has now been addressed in
> 
> commit c1f275bfa644beafab9f8572351d4b64d61c148b
> Author: Nirbheek Chauhan <nirbheek@centricular.com>
> Date:   Sun May 6 20:09:49 2018 +0530
> 
>     gnome.gtkdoc: Allow passing file objects as xml_files
> 
>     If we pass a source files() object, we will look for it in the build
>     directory, which is wrong. If we pass a build files() object (from
>     configure_file()), we will find it in the build directory, and then
>     try to copy it on top of itself in gtkdochelper.py getting a
>     SameFileError.
> 
>     Add a test for it, and also properly iterate custom target outputs
>     when adding to content files.
> 
> Downside of this all is that we'd need to up the meson requirements to
> something like 0.47, which isn't even released yet :-/
> 
> v2: Rebase and also add version requirement.
> 
> v3: I figured out how to make this work with a meson version check!
> 
> v4: Remove stray hunk (Petri).
> 
> Cc: Eric Anholt <eric@anholt.net>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Reviewed-by: Petri Latvala <petri.latvala@intel.com>


> ---
>  docs/reference/igt-gpu-tools/meson.build | 49 ++++++++++++++++--------
>  1 file changed, 34 insertions(+), 15 deletions(-)
> 
> diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
> index aadb9af593d9..ebcb6b7a4874 100644
> --- a/docs/reference/igt-gpu-tools/meson.build
> +++ b/docs/reference/igt-gpu-tools/meson.build
> @@ -50,27 +50,46 @@ gen_programs = find_program('generate_programs_xml.sh')
>  
>  test_list_files = []
>  
> -foreach group : test_groups
> -	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
> -	custom_target(programs_xml,
> -		      output : programs_xml,
> -		      build_by_default : true,
> -		      command : [ gen_programs, '@OUTPUT@', group, test_list ])
> -
> -	description_xml = 'igt_test_programs_' + group + '_description.xml'
> -	custom_target(description_xml,
> -		      output : description_xml,
> -		      build_by_default : true,
> -		      depends : test_executables,
> -		      command : [ gen_description, '@OUTPUT@', group, test_list ])
> -endforeach
> +generated_docs = []
>  
>  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 ])
> +
> +		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 ])
> +	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 ])
> +
> +		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 ])
> +	endforeach
> +endif
> +
>  gnome.gtkdoc('igt-gpu-tools',
> -	     content_files : ['igt_test_programs.xml'],
> +	     content_files : ['igt_test_programs.xml'] + generated_docs,
>  	     dependencies : lib_igt,
>  	     install : true,
>  	     main_xml : 'igt-gpu-tools-docs.xml',
> -- 
> 2.17.0
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Daniel Vetter]

meson 0.45 properly supports generated content_files. Except for the
minor issue that we're hitting an internal bug in meson. I've made a
pull request for that

https://github.com/mesonbuild/meson/pull/3189

which has now been addressed in

commit c1f275bfa644beafab9f8572351d4b64d61c148b
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date:   Sun May 6 20:09:49 2018 +0530

    gnome.gtkdoc: Allow passing file objects as xml_files

    If we pass a source files() object, we will look for it in the build
    directory, which is wrong. If we pass a build files() object (from
    configure_file()), we will find it in the build directory, and then
    try to copy it on top of itself in gtkdochelper.py getting a
    SameFileError.

    Add a test for it, and also properly iterate custom target outputs
    when adding to content files.

Downside of this all is that we'd need to up the meson requirements to
something like 0.47, which isn't even released yet :-/

v2: Rebase and also add version requirement.

v3: I figured out how to make this work with a meson version check!

v4: Remove stray hunk (Petri).

Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 docs/reference/igt-gpu-tools/meson.build | 49 ++++++++++++++++--------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index aadb9af593d9..ebcb6b7a4874 100644
--- a/docs/reference/igt-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -50,27 +50,46 @@ gen_programs = find_program('generate_programs_xml.sh')
 
 test_list_files = []
 
-foreach group : test_groups
-	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
-	custom_target(programs_xml,
-		      output : programs_xml,
-		      build_by_default : true,
-		      command : [ gen_programs, '@OUTPUT@', group, test_list ])
-
-	description_xml = 'igt_test_programs_' + group + '_description.xml'
-	custom_target(description_xml,
-		      output : description_xml,
-		      build_by_default : true,
-		      depends : test_executables,
-		      command : [ gen_description, '@OUTPUT@', group, test_list ])
-endforeach
+generated_docs = []
 
 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 ])
+
+		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 ])
+	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 ])
+
+		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 ])
+	endforeach
+endif
+
 gnome.gtkdoc('igt-gpu-tools',
-	     content_files : ['igt_test_programs.xml'],
+	     content_files : ['igt_test_programs.xml'] + generated_docs,
 	     dependencies : lib_igt,
 	     install : true,
 	     main_xml : 'igt-gpu-tools-docs.xml',
-- 
2.17.0

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

[igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Daniel Vetter]

meson 0.45 properly supports generated content_files. Except for the
minor issue that we're hitting an internal bug in meson. I've made a
pull request for that

https://github.com/mesonbuild/meson/pull/3189

which has now been addressed in

commit c1f275bfa644beafab9f8572351d4b64d61c148b
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date:   Sun May 6 20:09:49 2018 +0530

    gnome.gtkdoc: Allow passing file objects as xml_files

    If we pass a source files() object, we will look for it in the build
    directory, which is wrong. If we pass a build files() object (from
    configure_file()), we will find it in the build directory, and then
    try to copy it on top of itself in gtkdochelper.py getting a
    SameFileError.

    Add a test for it, and also properly iterate custom target outputs
    when adding to content files.

Downside of this all is that we'd need to up the meson requirements to
something like 0.47, which isn't even released yet :-/

v2: Rebase and also add version requirement.

v3: I figured out how to make this work with a meson version check!

Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 docs/reference/igt-gpu-tools/meson.build | 49 ++++++++++++++++--------
 meson.build                              |  2 +-
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index aadb9af593d9..ebcb6b7a4874 100644
--- a/docs/reference/igt-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -50,27 +50,46 @@ gen_programs = find_program('generate_programs_xml.sh')
 
 test_list_files = []
 
-foreach group : test_groups
-	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
-	custom_target(programs_xml,
-		      output : programs_xml,
-		      build_by_default : true,
-		      command : [ gen_programs, '@OUTPUT@', group, test_list ])
-
-	description_xml = 'igt_test_programs_' + group + '_description.xml'
-	custom_target(description_xml,
-		      output : description_xml,
-		      build_by_default : true,
-		      depends : test_executables,
-		      command : [ gen_description, '@OUTPUT@', group, test_list ])
-endforeach
+generated_docs = []
 
 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 ])
+
+		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 ])
+	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 ])
+
+		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 ])
+	endforeach
+endif
+
 gnome.gtkdoc('igt-gpu-tools',
-	     content_files : ['igt_test_programs.xml'],
+	     content_files : ['igt_test_programs.xml'] + generated_docs,
 	     dependencies : lib_igt,
 	     install : true,
 	     main_xml : 'igt-gpu-tools-docs.xml',
diff --git a/meson.build b/meson.build
index cd736d8e232a..0509a8f88799 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('igt-gpu-tools', 'c',
           'c_std=gnu99',
         ],
 	license : 'MIT',
-	meson_version : '>0.40.0')
+	meson_version : '>0.40')
 
 cc = meson.get_compiler('c')
 
-- 
2.17.0

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

Re: [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Daniel Vetter]

On Mon, Jun 18, 2018 at 05:49:21PM +0200, Daniel Vetter wrote:
> meson 0.45 properly supports generated content_files. Except for the
> minor issue that we're hitting an internal bug in meson. I've made a
> pull request for that
> 
> https://github.com/mesonbuild/meson/pull/3189
> 
> which has now been addressed in
> 
> commit c1f275bfa644beafab9f8572351d4b64d61c148b
> Author: Nirbheek Chauhan <nirbheek@centricular.com>
> Date:   Sun May 6 20:09:49 2018 +0530
> 
>     gnome.gtkdoc: Allow passing file objects as xml_files
> 
>     If we pass a source files() object, we will look for it in the build
>     directory, which is wrong. If we pass a build files() object (from
>     configure_file()), we will find it in the build directory, and then
>     try to copy it on top of itself in gtkdochelper.py getting a
>     SameFileError.
> 
>     Add a test for it, and also properly iterate custom target outputs
>     when adding to content files.
> 
> Downside of this all is that we'd need to up the meson requirements to
> something like 0.47, which isn't even released yet :-/
> 
> v2: Rebase and also add version requirement.
> 
> Cc: Eric Anholt <eric@anholt.net>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  docs/reference/igt-gpu-tools/meson.build | 10 +++++-----
>  meson.build                              |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
> index aadb9af593d9..4f33c973a343 100644
> --- a/docs/reference/igt-gpu-tools/meson.build
> +++ b/docs/reference/igt-gpu-tools/meson.build
> @@ -50,17 +50,17 @@ gen_programs = find_program('generate_programs_xml.sh')
>  
>  test_list_files = []
>  
> +generated_docs = []
> +
>  foreach group : test_groups
>  	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
> -	custom_target(programs_xml,
> +	generated_docs += custom_target(programs_xml,
>  		      output : programs_xml,
> -		      build_by_default : true,
>  		      command : [ gen_programs, '@OUTPUT@', group, test_list ])
>  
>  	description_xml = 'igt_test_programs_' + group + '_description.xml'
> -	custom_target(description_xml,
> +	generated_docs += custom_target(description_xml,
>  		      output : description_xml,
> -		      build_by_default : true,
>  		      depends : test_executables,
>  		      command : [ gen_description, '@OUTPUT@', group, test_list ])
>  endforeach
> @@ -70,7 +70,7 @@ configure_file(input: 'version.xml.in',
>  	       install: false, configuration: config)
>  
>  gnome.gtkdoc('igt-gpu-tools',
> -	     content_files : ['igt_test_programs.xml'],
> +	     content_files : ['igt_test_programs.xml'] + generated_docs,
>  	     dependencies : lib_igt,
>  	     install : true,
>  	     main_xml : 'igt-gpu-tools-docs.xml',
> diff --git a/meson.build b/meson.build
> index cd736d8e232a..1e7b37bfa406 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -5,7 +5,7 @@ project('igt-gpu-tools', 'c',
>            'c_std=gnu99',
>          ],
>  	license : 'MIT',
> -	meson_version : '>0.40.0')
> +	meson_version : '>0.47')

If anyone can come up with a way to make this a requirement only for
building the docs, it would be super-awesome. But I have no idea how to
pull that stunt off ...
-Daniel

>  
>  cc = meson.get_compiler('c')
>  
> -- 
> 2.17.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

[igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

[Daniel Vetter]

meson 0.45 properly supports generated content_files. Except for the
minor issue that we're hitting an internal bug in meson. I've made a
pull request for that

https://github.com/mesonbuild/meson/pull/3189

which has now been addressed in

commit c1f275bfa644beafab9f8572351d4b64d61c148b
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date:   Sun May 6 20:09:49 2018 +0530

    gnome.gtkdoc: Allow passing file objects as xml_files

    If we pass a source files() object, we will look for it in the build
    directory, which is wrong. If we pass a build files() object (from
    configure_file()), we will find it in the build directory, and then
    try to copy it on top of itself in gtkdochelper.py getting a
    SameFileError.

    Add a test for it, and also properly iterate custom target outputs
    when adding to content files.

Downside of this all is that we'd need to up the meson requirements to
something like 0.47, which isn't even released yet :-/

v2: Rebase and also add version requirement.

Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 docs/reference/igt-gpu-tools/meson.build | 10 +++++-----
 meson.build                              |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index aadb9af593d9..4f33c973a343 100644
--- a/docs/reference/igt-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -50,17 +50,17 @@ gen_programs = find_program('generate_programs_xml.sh')
 
 test_list_files = []
 
+generated_docs = []
+
 foreach group : test_groups
 	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
-	custom_target(programs_xml,
+	generated_docs += custom_target(programs_xml,
 		      output : programs_xml,
-		      build_by_default : true,
 		      command : [ gen_programs, '@OUTPUT@', group, test_list ])
 
 	description_xml = 'igt_test_programs_' + group + '_description.xml'
-	custom_target(description_xml,
+	generated_docs += custom_target(description_xml,
 		      output : description_xml,
-		      build_by_default : true,
 		      depends : test_executables,
 		      command : [ gen_description, '@OUTPUT@', group, test_list ])
 endforeach
@@ -70,7 +70,7 @@ configure_file(input: 'version.xml.in',
 	       install: false, configuration: config)
 
 gnome.gtkdoc('igt-gpu-tools',
-	     content_files : ['igt_test_programs.xml'],
+	     content_files : ['igt_test_programs.xml'] + generated_docs,
 	     dependencies : lib_igt,
 	     install : true,
 	     main_xml : 'igt-gpu-tools-docs.xml',
diff --git a/meson.build b/meson.build
index cd736d8e232a..1e7b37bfa406 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('igt-gpu-tools', 'c',
           'c_std=gnu99',
         ],
 	license : 'MIT',
-	meson_version : '>0.40.0')
+	meson_version : '>0.47')
 
 cc = meson.get_compiler('c')
 
-- 
2.17.0

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