OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git_sha1: simplify logic

Browse Source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Eric Engestrom
2018-08-16 14:02:44 +01:00
parent 9a6a631762
commit 471f708ed6
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/git_sha1_gen.py
View File

@@ -47,10 +47,6 @@ args = parser.parse_args()
git_sha1 = os.environ.get('MESA_GIT_SHA1_OVERRIDE', get_git_sha1())[:10] git_sha1 = os.environ.get('MESA_GIT_SHA1_OVERRIDE', get_git_sha1())[:10]
if git_sha1: if git_sha1:
git_sha1_h_in_path = os.path.join(os.path.dirname(sys.argv[0]), write_if_different('#define MESA_GIT_SHA1 "git-' + git_sha1 + '"')
'..', '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)
else: else:
write_if_different('') write_if_different('')

2
src/Makefile.am
View File

@@ -20,7 +20,7 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
.PHONY: git_sha1.h .PHONY: git_sha1.h
git_sha1.h: $(top_srcdir)/src/git_sha1.h.in git_sha1.h:
@echo "updating $@" @echo "updating $@"
@$(PYTHON2) $(top_srcdir)/bin/git_sha1_gen.py --output $@ @$(PYTHON2) $(top_srcdir)/bin/git_sha1_gen.py --output $@

1
src/git_sha1.h.in
View File

@@ -1 +0,0 @@
#define MESA_GIT_SHA1 "git-@VCS_TAG@"

2
src/mesa/Android.libmesa_git_sha1.mk
View File

@@ -43,7 +43,7 @@ $(intermediates)/dummy.c:
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, git_sha1.h) 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 $@) @mkdir -p $(dir $@)
@echo "GIT-SHA1: $(PRIVATE_MODULE) <= git" @echo "GIT-SHA1: $(PRIVATE_MODULE) <= git"
$(hide) $(MESA_PYTHON2) $(MESA_TOP)/bin/git_sha1_gen.py --output $@ $(hide) $(MESA_PYTHON2) $(MESA_TOP)/bin/git_sha1_gen.py --output $@