Mesa (master): git_sha1_gen: use git_sha1.h.in on all build systems

Eric Engeström eric_engestrom at kemper.freedesktop.org
Mon Oct 16 17:53:18 UTC 2017


Module: Mesa
Branch: master
Commit: 16be271c6ee618e79c7d72ce0d88114aa7aaffb6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=16be271c6ee618e79c7d72ce0d88114aa7aaffb6

Author: Eric Engestrom <eric.engestrom at imgtec.com>
Date:   Mon Oct 16 17:02:03 2017 +0100

git_sha1_gen: use git_sha1.h.in on all build systems

Meson already uses this, let's get the other build sys to use it too.

Note: rstrip() was dropped, as truncating to the first 10 chars already
gets rid of the terminating newline (not an issue with the env var
either, unless maliciously crafted to break the build... not sure this
is a real-world issue).

Verified to work and give the same output as before on both python 2
and 3 :)

Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 bin/git_sha1_gen.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/git_sha1_gen.py b/bin/git_sha1_gen.py
index 87e06a8d93..c75dba101a 100755
--- a/bin/git_sha1_gen.py
+++ b/bin/git_sha1_gen.py
@@ -30,4 +30,7 @@ def get_git_sha1():
 
 git_sha1 = os.environ.get('MESA_GIT_SHA1_OVERRIDE', get_git_sha1())[:10]
 if git_sha1:
-    sys.stdout.write('#define MESA_GIT_SHA1 "git-%s"\n' % git_sha1.rstrip())
+    git_sha1_h_in_path = os.path.join(os.path.dirname(sys.argv[0]),
+            '..', 'src', 'git_sha1.h.in')
+    with open(git_sha1_h_in_path , 'r') as git_sha1_h_in:
+        sys.stdout.write(git_sha1_h_in.read().replace('@VCS_TAG@', git_sha1))




More information about the mesa-commit mailing list