[PATCH i-g-t] build: make meson more official

[PATCH i-g-t] build: make meson more official

[Daniel Vetter]

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).

Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 CONTRIBUTING |  2 +-
 NEWS         |  6 ++++++
 README       | 17 ++++++++++++-----
 meson.sh     |  2 ++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 561c5dd80bba..0d70346526d3 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 will run:
 
     git config format.subjectprefix "PATCH i-g-t"
 
diff --git a/NEWS b/NEWS
index b6d0958228ab..885c1baf3691 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 e0f829defb51..5b4a59e9ac24 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
+recommened 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/meson.sh b/meson.sh
index ae8e3488d962..a8684f03e422 100755
--- a/meson.sh
+++ b/meson.sh
@@ -32,4 +32,6 @@ docs:
 
 EOF
 
+git config format.subjectprefix "PATCH i-g-t"
+
 make $@
-- 
2.15.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] build: make meson more official

[Petri Latvala]

On Thu, Jan 11, 2018 at 09:51:40AM +0100, Daniel Vetter wrote:
> 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).
> 
> Cc: Petri Latvala <petri.latvala@intel.com>
> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  CONTRIBUTING |  2 +-
>  NEWS         |  6 ++++++
>  README       | 17 ++++++++++++-----
>  meson.sh     |  2 ++
>  4 files changed, 21 insertions(+), 6 deletions(-)
> 
> diff --git a/CONTRIBUTING b/CONTRIBUTING
> index 561c5dd80bba..0d70346526d3 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 will run:


We still support both build systems, so mention both autogen.sh and
meson.sh here.


>  
>      git config format.subjectprefix "PATCH i-g-t"
>  
> diff --git a/NEWS b/NEWS
> index b6d0958228ab..885c1baf3691 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.
> +

Building up the release notes as-we-go, wonderful. But I wonder if the
upcoming stuff should be placed elsewhere while 1.21 doesn't yet
exist, to avoid confusion.

Maybe have the title of the section be:

Release 1.21 (not yet released)

or so?


>  Release 1.20 (2017-10-03)
>  -------------------------
>  
> diff --git a/README b/README
> index e0f829defb51..5b4a59e9ac24 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
> +recommened choice. Oneliner to get started:


Typo: recommended



Otherwise:
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] build: make meson more official

[Daniel Vetter]

On Thu, Jan 11, 2018 at 9:58 AM, Petri Latvala <petri.latvala@intel.com> wrote:
> On Thu, Jan 11, 2018 at 09:51:40AM +0100, Daniel Vetter wrote:
>> 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).
>>
>> Cc: Petri Latvala <petri.latvala@intel.com>
>> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
>> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>> ---
>>  CONTRIBUTING |  2 +-
>>  NEWS         |  6 ++++++
>>  README       | 17 ++++++++++++-----
>>  meson.sh     |  2 ++
>>  4 files changed, 21 insertions(+), 6 deletions(-)
>>
>> diff --git a/CONTRIBUTING b/CONTRIBUTING
>> index 561c5dd80bba..0d70346526d3 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 will run:
>
>
> We still support both build systems, so mention both autogen.sh and
> meson.sh here.
>
>
>>
>>      git config format.subjectprefix "PATCH i-g-t"
>>
>> diff --git a/NEWS b/NEWS
>> index b6d0958228ab..885c1baf3691 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.
>> +
>
> Building up the release notes as-we-go, wonderful. But I wonder if the
> upcoming stuff should be placed elsewhere while 1.21 doesn't yet
> exist, to avoid confusion.
>
> Maybe have the title of the section be:
>
> Release 1.21 (not yet released)

In the past I think we've used (XXXX-XX-XX) for that. And yes I've
always tried to build up the release notes as we go, and encouraging
people to help out by creating the new title right after the release
is tagged. See git log NEWS :-)

Will fix the other two and push.
-Daniel

>
> or so?
>
>
>>  Release 1.20 (2017-10-03)
>>  -------------------------
>>
>> diff --git a/README b/README
>> index e0f829defb51..5b4a59e9ac24 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
>> +recommened choice. Oneliner to get started:
>
>
> Typo: recommended
>
>
>
> Otherwise:
> Reviewed-by: Petri Latvala <petri.latvala@intel.com>



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for build: make meson more official

[Patchwork]

== Series Details ==

Series: build: make meson more official
URL   : https://patchwork.freedesktop.org/series/36320/
State : failure

== Summary ==

Applying: build: make meson more official
Using index info to reconstruct a base tree...
M	CONTRIBUTING
M	NEWS
M	README
M	meson.sh
Falling back to patching base and 3-way merge...
Auto-merging README
CONFLICT (content): Merge conflict in README
Auto-merging CONTRIBUTING
CONFLICT (content): Merge conflict in CONTRIBUTING
Patch failed at 0001 build: make meson more official
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx