meson: also allow setting GIT_VERSION via templates

GIT_VERSION is not available as a config.h variable, because it's rendered
into version.h during builds. Let's rework jinja2 rendering to also
parse version.h. No functional change, the new variable is so far unused.

I guess this will make partial rebuilds a bit slower, but it's useful
to be able to use the full version string.

1 files changed, 5 insertions, 4 deletions

diff --git a/tools/meson-render-jinja2.py b/tools/meson-render-jinja2.py
index 89735c70ed..fbaae596de 100755
--- a/tools/meson-render-jinja2.py
+++ b/tools/meson-render-jinja2.py
@@ -28,9 +28,10 @@ def render(filename, defines):
 
 if __name__ == '__main__':
     defines = parse_config_h(sys.argv[1])
-    output = render(sys.argv[2], defines)
-    with open(sys.argv[3], 'w') as f:
+    defines.update(parse_config_h(sys.argv[2]))
+    output = render(sys.argv[3], defines)
+    with open(sys.argv[4], 'w') as f:
         f.write(output)
         f.write('\n')
-    info = os.stat(sys.argv[2])
-    os.chmod(sys.argv[3], info.st_mode)
+    info = os.stat(sys.argv[3])
+    os.chmod(sys.argv[4], info.st_mode)