git_sha1: simplify logic
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
9a6a631762
commit
471f708ed6
|
@ -47,10 +47,6 @@ args = parser.parse_args()
|
|||
|
||||
git_sha1 = os.environ.get('MESA_GIT_SHA1_OVERRIDE', get_git_sha1())[:10]
|
||||
if git_sha1:
|
||||
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:
|
||||
new_sha1 = git_sha1_h_in.read().replace('@VCS_TAG@', git_sha1)
|
||||
write_if_different(new_sha1)
|
||||
write_if_different('#define MESA_GIT_SHA1 "git-' + git_sha1 + '"')
|
||||
else:
|
||||
write_if_different('')
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
# IN THE SOFTWARE.
|
||||
|
||||
.PHONY: git_sha1.h
|
||||
git_sha1.h: $(top_srcdir)/src/git_sha1.h.in
|
||||
git_sha1.h:
|
||||
@echo "updating $@"
|
||||
@$(PYTHON2) $(top_srcdir)/bin/git_sha1_gen.py --output $@
|
||||
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
#define MESA_GIT_SHA1 "git-@VCS_TAG@"
|
|
@ -43,7 +43,7 @@ $(intermediates)/dummy.c:
|
|||
|
||||
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, git_sha1.h)
|
||||
|
||||
$(intermediates)/git_sha1.h: $(MESA_TOP)/src/git_sha1.h.in $(wildcard $(MESA_TOP)/.git/logs/HEAD)
|
||||
$(intermediates)/git_sha1.h: $(wildcard $(MESA_TOP)/.git/logs/HEAD)
|
||||
@mkdir -p $(dir $@)
|
||||
@echo "GIT-SHA1: $(PRIVATE_MODULE) <= git"
|
||||
$(hide) $(MESA_PYTHON2) $(MESA_TOP)/bin/git_sha1_gen.py --output $@
|
||||
|
|
Loading…
Reference in New Issue