scons: put the generated git_sha1.h file in top-level src/ directory

To match what's done in the automake build.

v2: Use git rev-parse to get a 10-character hash ID
    Fix Python imports

Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul
2016-06-15 10:42:34 -06:00
parent 5a64549f54
commit ace3124f22
2 changed files with 50 additions and 44 deletions

View File

@@ -3,9 +3,6 @@
Import('*')
import filecmp
import os
import subprocess
from sys import executable as python_cmd
env = env.Clone()
@@ -18,10 +15,12 @@ env.Append(CPPPATH = [
'#/src/mapi',
'#/src/glsl',
'#/src/mesa',
'#/src/mesa/main',
'#/src/gallium/include',
'#/src/gallium/auxiliary',
Dir('../mapi'), # src/mapi build path
Dir('.'), # src/mesa build path
Dir('main'), # src/mesa/main/ build path
])
if env['platform'] == 'windows':
@@ -119,46 +118,6 @@ if env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
env.Append(CPPPATH = [matypes[0].dir])
def write_git_sha1_h_file(filename):
"""Mesa looks for a git_sha1.h file at compile time in order to display
the current git hash id in the GL_VERSION string. This function tries
to retrieve the git hashid and write the header file. An empty file
will be created if anything goes wrong."""
args = [ 'git', 'log', '-n', '1', '--oneline' ]
try:
(commit, foo) = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()
except:
# git log command didn't work
if not os.path.exists(filename):
dirname = os.path.dirname(filename)
if not os.path.exists(dirname):
os.makedirs(dirname)
# create an empty file if none already exists
f = open(filename, "w")
f.close()
return
commit = '#define MESA_GIT_SHA1 "git-%s"\n' % commit[0:7]
tempfile = "git_sha1.h.tmp"
f = open(tempfile, "w")
f.write(commit)
f.close()
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.
if os.path.exists(filename):
os.remove(filename)
os.rename(tempfile, filename)
return
# Create the git_sha1.h header file
write_git_sha1_h_file("main/git_sha1.h")
# and update CPPPATH so the git_sha1.h header can be found
env.Append(CPPPATH = ["#" + env['build_dir'] + "/mesa/main"])
#
# Libraries
#