build: make meson more official

I also noticed that meson.sh doesn't set the prefix for patch
submission. Fix that (even thought hopefully real soon igt will move
to its own list).

v2: Review from Petri.

Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

5 files changed, 24 insertions, 9 deletions

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 561c5dd8..2e746c73 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -12,7 +12,7 @@ A short list of contribution guidelines:
 
   Please use --subject-prefix="PATCH i-g-t" so that i-g-t patches are easily
   identified in the massive amount mails on intel-gfx. To ensure this is always
-  done, autogen.sh will run:
+  done, meson.sh (and autogen.sh) will run:
 
     git config format.subjectprefix "PATCH i-g-t"
 
diff --git a/NEWS b/NEWS
index b6d09582..885c1baf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Release 1.21
+------------
+
+- Upgrade meson to official production status, automake is still kept around for
+  now.
+
 Release 1.20 (2017-10-03)
 -------------------------
 
diff --git a/README b/README
index e0f829de..807db0e3 100644
--- a/README
+++ b/README
@@ -167,11 +167,11 @@ The following dependencies are requires for building audio support
 	libasound2-dev
 	libgsl-dev
 
-Experimental meson build system support
----------------------------------------
+Meson build system support
+--------------------------
 
-Right now this is just a preview for developers, automake is still used by CI
-and needs to keep working. One-liner howto:
+Currently we support both meson and automake as build systems, but meson is the
+recommended choice. Oneliner to get started:
 
 $ mkdir build && meson build && cd build && ninja
 
@@ -181,7 +181,14 @@ Running testcases is done with
 
 $ cd build && ninja test
 
-gtkdocs is currently not yet supported.
+Documentation is built using
+
+$ cd build && ninja && ninja intel-gpu-tools-doc
+
+Note that there's a setup script similar to ./autogen.sh which creates a
+compatibility Makefile with a few useful default targets:
+
+$ ./meson.sh [make-arguments]
 
 Releases for maintainers
 ------------------------
diff --git a/docs/reference/intel-gpu-tools/meson.build b/docs/reference/intel-gpu-tools/meson.build
index 1c009229..fc28d36d 100644
--- a/docs/reference/intel-gpu-tools/meson.build
+++ b/docs/reference/intel-gpu-tools/meson.build
@@ -52,13 +52,13 @@ test_list_files = []
 
 foreach group : test_groups
 	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
-	custom_target(programs_xml,
+	test_list_files += 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,
+	test_list_files += custom_target(description_xml,
 		      output : description_xml,
 		      build_by_default : true,
 		      depends : test_executables,
@@ -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', test_list_files ],
 	     dependencies : lib_igt,
 	     install : true,
 	     main_xml : 'intel-gpu-tools-docs.xml',
diff --git a/meson.sh b/meson.sh
index ae8e3488..a8684f03 100755
--- a/meson.sh
+++ b/meson.sh
@@ -32,4 +32,6 @@ docs:
 
 EOF
 
+git config format.subjectprefix "PATCH i-g-t"
+
 make $@