[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

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

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] ✗ Fi.CI.BAT: failure for gtkdoc: Remove the build_by_default hack (rev2)

[Patchwork]

== Series Details ==

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

== Summary ==

IGT patchset build failed on latest successful build
778497e7965dc8662c770a89ebbd741778feb71e lib: Purge os caches twice for good luck

The Meson build system
Version: 0.45.1
Source dir: /home/cidrm/igt-gpu-tools
Build dir: /home/cidrm/igt-gpu-tools/build
Build type: native build

meson.build:1:0: ERROR: Meson version is 0.45.1 but project requires >0.47.

A full log can be found at /home/cidrm/igt-gpu-tools/build/meson-logs/meson-log.txt

_______________________________________________
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

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!

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

[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

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