diff options
| author | Jose Fonseca <[email protected]> | 2017-08-01 14:36:16 +0100 |
|---|---|---|
| committer | Jose Fonseca <[email protected]> | 2017-08-01 15:24:39 +0100 |
| commit | b99dcbfeb344390fea9919199b34e5504f7c84e3 (patch) | |
| tree | a7ebdd094311f016fb8a8b4f618f540bf647e159 /src | |
| parent | 1bc8b2c0ebbc5f5d930058d5214b724468f981c2 (diff) | |
build: Convert git_sha1_gen script to Python.
Python is the scripting language we've been using for scripts that need
to run across all supported platforms.
Shell is *not* a portable language for scripts.
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/SConscript | 3 | ||||
| -rw-r--r-- | src/mesa/Android.libmesa_git_sha1.mk | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5aee6b01417..8d7483fc758 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,7 @@ .PHONY: git_sha1.h.tmp git_sha1.h.tmp: - @sh $(top_srcdir)/bin/git_sha1_gen.sh > $@ + @python $(top_srcdir)/bin/git_sha1_gen.py > $@ git_sha1.h: git_sha1.h.tmp @echo "updating git_sha1.h" diff --git a/src/SConscript b/src/SConscript index 82bc28518ef..bd20d4e2108 100644 --- a/src/SConscript +++ b/src/SConscript @@ -1,6 +1,7 @@ import filecmp import os import subprocess +from sys import executable as python_cmd Import('*') @@ -25,7 +26,7 @@ def write_git_sha1_h_file(filename): tempfile = "git_sha1.h.tmp" with open(tempfile, "w") as f: - args = [ 'sh', Dir('#').abspath + '/bin/git_sha1_gen.sh' ] + args = [ python_cmd, Dir('#').abspath + '/bin/git_sha1_gen.py' ] try: subprocess.Popen(args, stdout=f).wait() except: diff --git a/src/mesa/Android.libmesa_git_sha1.mk b/src/mesa/Android.libmesa_git_sha1.mk index 7d64b1c809c..f66f88484bc 100644 --- a/src/mesa/Android.libmesa_git_sha1.mk +++ b/src/mesa/Android.libmesa_git_sha1.mk @@ -46,7 +46,7 @@ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, git_sha1.h) $(intermediates)/git_sha1.h: $(wildcard $(MESA_TOP)/.git/logs/HEAD) @mkdir -p $(dir $@) @echo "GIT-SHA1: $(PRIVATE_MODULE) <= git" - $(hide) sh $(MESA_TOP)/bin/git_sha1_gen.sh > $@ + $(hide) python $(MESA_TOP)/bin/git_sha1_gen.py > $@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) |