[Mesa-dev] [PATCH v2 17/24] meson: wire the new generator for es1 and es2

[Erik Faye-Lund]

For 16 and 17:

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>

On Fri, 2018-12-14 at 14:04 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> v2: use ${foo})_py naming (Dylan)
> 
> Cc: Dylan Baker <dylan at pnwbakers.com>
> Cc: Eric Engestrom <eric.engestrom at intel.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/mapi/es1api/meson.build    | 6 +++---
>  src/mapi/es2api/meson.build    | 6 +++---
>  src/mapi/glapi/gen/meson.build | 7 +++++++
>  3 files changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/src/mapi/es1api/meson.build
> b/src/mapi/es1api/meson.build
> index 53e894f091c..b0416e705a1 100644
> --- a/src/mapi/es1api/meson.build
> +++ b/src/mapi/es1api/meson.build
> @@ -20,10 +20,10 @@
>  
>  es1_glapi_mapi_tmp_h = custom_target(
>    'es1_glapi_mapi_tmp.h',
> -  input : [mapi_abi_py, gl_and_es_api_files],
> +  input : [glapi_gen_mapi_py, glapi_gen_gl_xml],
>    output : 'glapi_mapi_tmp.h',
> -  command : [prog_python, '@INPUT0@', '--printer', 'es1api', 
> '@INPUT1@'],
> -  depend_files : api_xml_files,
> +  command : [prog_python, '@INPUT0@', 'glesv1', '@INPUT1@'],
> +  depend_files : glapi_gen_mapi_deps,
>    capture : true,
>  )
>  
> diff --git a/src/mapi/es2api/meson.build
> b/src/mapi/es2api/meson.build
> index 1f397e2b752..a7f0904b699 100644
> --- a/src/mapi/es2api/meson.build
> +++ b/src/mapi/es2api/meson.build
> @@ -20,10 +20,10 @@
>  
>  es2_glapi_mapi_tmp_h = custom_target(
>    'es2_glapi_mapi_tmp.h',
> -  input : [mapi_abi_py, gl_and_es_api_files],
> +  input : [glapi_gen_mapi_py, glapi_gen_gl_xml],
>    output : 'glapi_mapi_tmp.h',
> -  command : [prog_python, '@INPUT0@', '--printer', 'es2api', 
> '@INPUT1@'],
> -  depend_files : api_xml_files,
> +  command : [prog_python, '@INPUT0@', 'glesv2', '@INPUT1@'],
> +  depend_files : glapi_gen_mapi_deps,
>    capture : true,
>  )
>  
> diff --git a/src/mapi/glapi/gen/meson.build
> b/src/mapi/glapi/gen/meson.build
> index 8cc163b2989..113e88aa99a 100644
> --- a/src/mapi/glapi/gen/meson.build
> +++ b/src/mapi/glapi/gen/meson.build
> @@ -18,6 +18,13 @@
>  # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS IN THE
>  # SOFTWARE.
>  
> +glapi_gen_gl_xml = files('../registry/gl.xml')
> +glapi_gen_mapi_deps = [
> +  glapi_gen_gl_xml,
> +  files('../../new/genCommon.py'),
> +  glapi_gen_gl_xml,
> +]
> +
>  gl_and_es_api_files = files('gl_and_es_API.xml')
>  
>  api_xml_files = files(