From 3fd425aed764fb771f2f49ddb6b30b389a114504 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 27 Jun 2017 12:08:41 +0100 Subject: build systems: uniformize git_sha1.h generation Signed-off-by: Eric Engestrom Reviewed-by: Matt Turner Reviewed-by: Emil Velikov --- src/SConscript | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'src/SConscript') diff --git a/src/SConscript b/src/SConscript index d861af8e4d7..5e1171b5246 100644 --- a/src/SConscript +++ b/src/SConscript @@ -22,27 +22,15 @@ def write_git_sha1_h_file(filename): to retrieve the git hashid and write the header file. An empty file will be created if anything goes wrong.""" - args = [ 'git', 'rev-parse', '--short=10', 'HEAD' ] - try: - (commit, foo) = subprocess.Popen(args, stdout=subprocess.PIPE).communicate() - except: - print "Warning: exception in write_git_sha1_h_file()" - # git log command didn't work - if not os.path.exists(filename): - dirname = os.path.dirname(filename) - if dirname and not os.path.exists(dirname): - os.makedirs(dirname) - # create an empty file if none already exists - f = open(filename, "w") - f.close() - return - - # note that commit[:-1] removes the trailing newline character - commit = '#define MESA_GIT_SHA1 "git-%s"\n' % commit[:-1] tempfile = "git_sha1.h.tmp" - f = open(tempfile, "w") - f.write(commit) - f.close() + with open(tempfile, "w") as f: + args = [ 'sh', Dir('#').abspath + '/git_sha1_gen.sh' ] + try: + subprocess.Popen(args, stdout=f) + except: + print "Warning: exception in write_git_sha1_h_file()" + return + if not os.path.exists(filename) or not filecmp.cmp(tempfile, filename): # The filename does not exist or it's different from the new file, # so replace old file with new. -- cgit v1.2.3