[Mesa-dev] [PATCH] mapi/shared-glapi/test: rework glapitable.h handling

[Emil Velikov]

On 13 October 2017 at 19:13, Dylan Baker <dylan at pnwbakers.com> wrote:
> Quoting Emil Velikov (2017-10-13 08:35:47)
>> From: Emil Velikov <emil.velikov at collabora.com>
>>
>> Currently all the build systems but Meson generate the header in
>> src/mapi/glapi. Meson cannot do that since:
>>  - it does not allow user control over the location of output files
>>  - moving the generation rule(s) causes explosion due to the unusual
>> structure of glapi and friends
>>  - copying the file into the correct location is a non-trivial task
>>
>> To workaround the above deficiency in the least invasive way, let's
>> adjust the #include directive and add a few -I flags to the autotools
>> build.
>>
>> Note: both builddir and srcdir, should be used. Otherwise building from
>> a release tarball fails badly.
>>
>> Cc: Dylan Baker <dylanx.c.baker at intel.com>
>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
>> ---
>> Dylan seems like glapi_gentable.c dependency tracking is broken/missing.
>> Furthermore the tests seems to be broken on Meson even w/o my revert :-(
>> ---
>>  src/mapi/Makefile.am                        | 5 +++--
>>  src/mapi/shared-glapi/tests/check_table.cpp | 2 +-
>>  2 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
>> index 83e32d2185e..3f8fcc02e55 100644
>> --- a/src/mapi/Makefile.am
>> +++ b/src/mapi/Makefile.am
>> @@ -47,7 +47,9 @@ AM_CPPFLAGS =                                                 \
>>         -I$(top_srcdir)/include                                 \
>>         -I$(top_srcdir)/src                                     \
>>         -I$(top_builddir)/src/mapi                              \
>> -       -I$(top_srcdir)/src/mapi
>> +       -I$(top_srcdir)/src/mapi                                \
>> +       -I$(top_builddir)/src/mapi/glapi                        \
>> +       -I$(top_srcdir)/src/mapi/glapi
>>
>>  include Makefile.sources
>>
>> @@ -113,7 +115,6 @@ endif
>>  glapi_libglapi_la_SOURCES =
>>  glapi_libglapi_la_CPPFLAGS = \
>>         $(AM_CPPFLAGS) \
>> -       -I$(top_srcdir)/src/mapi/glapi \
>>         -I$(top_srcdir)/src/mesa
>>
>>  if HAVE_APPLEDRI
>> diff --git a/src/mapi/shared-glapi/tests/check_table.cpp b/src/mapi/shared-glapi/tests/check_table.cpp
>> index 02d313c22d3..314e6769b49 100644
>> --- a/src/mapi/shared-glapi/tests/check_table.cpp
>> +++ b/src/mapi/shared-glapi/tests/check_table.cpp
>> @@ -25,7 +25,7 @@
>>  #include "../../../mesa/main/glheader.h"
>>
>>  #include "glapi/glapi.h"
>> -#include "glapi/glapitable.h"
>> +#include "glapitable.h"
>>
>>  struct name_offset {
>>     const char *name;
>> --
>> 2.14.1
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
> I went ahead and pushed this, it has review and testing and this will unbreak
> our CI. Thanks for looking into this.
>
Thanks for that, just came back from dinner.
You're right, I should not have reverted w/o checking with you. I was
not expecting that you'll immediately switch to Meson.

Looking at Martin Peres' talk at XDC I'm wondering ...

Can one convince Jenkins to send a lovely email to the list if things break?
Sort of like how Appveyor does it. It should safe you guys some time.

-Emil