From: Eric Engestrom Date: Thu, 6 Jul 2017 19:25:28 +0000 (+0100) Subject: build systems: move git_sha1_gen.sh to bin/ X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=076faf8764d3cd8038145286f7533d0a18e82476;p=mesa.git build systems: move git_sha1_gen.sh to bin/ There was no reason for this script to live outside the scripts directory. Suggested-by: Brian Paul Signed-off-by: Eric Engestrom Reviewed-by: Brian Paul --- diff --git a/Makefile.am b/Makefile.am index d1eadee1e1c..51542af3b82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,7 @@ EXTRA_DIST = \ common.py \ docs \ doxygen \ - git_sha1_gen.sh \ + bin/git_sha1_gen.sh \ scons \ SConstruct diff --git a/bin/git_sha1_gen.sh b/bin/git_sha1_gen.sh new file mode 100755 index 00000000000..898e5907587 --- /dev/null +++ b/bin/git_sha1_gen.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# run git from the sources directory +cd "$(dirname "$0")" + +# don't print anything if git fails +if ! git_sha1=$(git --git-dir=../.git rev-parse --short=10 HEAD 2>/dev/null) +then + exit +fi + +printf '#define MESA_GIT_SHA1 "git-%s"\n' "$git_sha1" diff --git a/git_sha1_gen.sh b/git_sha1_gen.sh deleted file mode 100755 index 20ab8df8eae..00000000000 --- a/git_sha1_gen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# run git from the sources directory -cd "$(dirname "$0")" - -# don't print anything if git fails -if ! git_sha1=$(git --git-dir=.git rev-parse --short=10 HEAD 2>/dev/null) -then - exit -fi - -printf '#define MESA_GIT_SHA1 "git-%s"\n' "$git_sha1" diff --git a/src/Makefile.am b/src/Makefile.am index 36995e08a45..5aee6b01417 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)/git_sha1_gen.sh > $@ + @sh $(top_srcdir)/bin/git_sha1_gen.sh > $@ git_sha1.h: git_sha1.h.tmp @echo "updating git_sha1.h" diff --git a/src/SConscript b/src/SConscript index c31e4ec06fa..37b3f8572e2 100644 --- a/src/SConscript +++ b/src/SConscript @@ -24,7 +24,7 @@ def write_git_sha1_h_file(filename): tempfile = "git_sha1.h.tmp" with open(tempfile, "w") as f: - args = [ 'sh', Dir('#').abspath + '/git_sha1_gen.sh' ] + args = [ 'sh', Dir('#').abspath + '/bin/git_sha1_gen.sh' ] 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 a5a1ebb37f5..7d64b1c809c 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)/git_sha1_gen.sh > $@ + $(hide) sh $(MESA_TOP)/bin/git_sha1_gen.sh > $@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)