[Mesa-dev] [PATCH v3 07/24] mapi: move genCommon.py to src/mapi/new

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

The helper will also be used by the new Khronos gl.xml aware generator.

v2: Move existing one, instead of duplicating it.
v3: Correct genCommon.py references in meson [Erik]

Suggested-by: Kyle Brenneman <kbrenneman at nvidia.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/egl/Makefile.am                         | 6 ++++--
 src/egl/generate/gen_egl_dispatch.py        | 3 +++
 src/egl/meson.build                         | 4 ++--
 src/mapi/Makefile.am                        | 1 +
 src/mapi/meson.build                        | 1 +
 src/{egl/generate => mapi/new}/genCommon.py | 0
 6 files changed, 11 insertions(+), 4 deletions(-)
 rename src/{egl/generate => mapi/new}/genCommon.py (100%)

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 7269912d96f..6ce51936b16 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -136,8 +136,10 @@ libEGL_common_la_LIBADD += \
 	$(LIBDRM_LIBS) \
 	$(CLOCK_LIB)
 
-GLVND_GEN_DEPS = generate/gen_egl_dispatch.py \
-	generate/egl.xml generate/eglFunctionList.py generate/genCommon.py \
+GLVND_GEN_DEPS = $(top_scrdir)/src/mapi/new/generate/genCommon.py \
+	generate/gen_egl_dispatch.py \
+	generate/eglFunctionList.py \
+	generate/egl.xml \
 	generate/egl_other.xml
 
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
diff --git a/src/egl/generate/gen_egl_dispatch.py b/src/egl/generate/gen_egl_dispatch.py
index eeb3f3f9a5a..728799e9754 100644
--- a/src/egl/generate/gen_egl_dispatch.py
+++ b/src/egl/generate/gen_egl_dispatch.py
@@ -38,6 +38,9 @@ import imp
 import sys
 import textwrap
 
+import os
+NEWAPI = os.path.join(os.path.dirname(__file__), "..", "..", "mapi", "new")
+sys.path.insert(0, NEWAPI)
 import genCommon
 
 def main():
diff --git a/src/egl/meson.build b/src/egl/meson.build
index 89bac2cd633..6c8bb244e0a 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -69,7 +69,7 @@ g_egldispatchstubs_c = custom_target(
   command : [
     prog_python, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@', '@INPUT3@'
   ],
-  depend_files : files('generate/genCommon.py'),
+  depend_files : genCommon_py,
   capture : true,
 )
 
@@ -83,7 +83,7 @@ g_egldispatchstubs_h = custom_target(
   command : [
     prog_python, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@', '@INPUT3@'
   ],
-  depend_files : files('generate/genCommon.py'),
+  depend_files : genCommon_py,
   capture : true,
 )
 
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 97ebdeb1d7f..b46ed814700 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -31,6 +31,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
 
 EXTRA_DIST = \
+	new/genCommon.py \
 	es1api/ABI-check \
 	es2api/ABI-check \
 	mapi_abi.py \
diff --git a/src/mapi/meson.build b/src/mapi/meson.build
index 798586bfb0c..24013c65542 100644
--- a/src/mapi/meson.build
+++ b/src/mapi/meson.build
@@ -25,6 +25,7 @@ files_mapi_util = files(
   'u_execmem.h',
 )
 
+genCommon_py = files('new/genCommon.py')
 mapi_abi_py = files('mapi_abi.py')
 
 subdir('glapi')
diff --git a/src/egl/generate/genCommon.py b/src/mapi/new/genCommon.py
similarity index 100%
rename from src/egl/generate/genCommon.py
rename to src/mapi/new/genCommon.py
-- 
2.19.2