From: Eric Engestrom Date: Mon, 16 Oct 2017 16:02:03 +0000 (+0100) Subject: git_sha1_gen: use git_sha1.h.in on all build systems X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=16be271c6ee618e79c7d72ce0d88114aa7aaffb6;p=mesa.git 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 Reviewed-by: Brian Paul --- diff --git a/bin/git_sha1_gen.py b/bin/git_sha1_gen.py index 87e06a8d936..c75dba101ac 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))