From e901608d09410f24587f1ee8b5d7bdbe2eb1e0b7 Mon Sep 17 00:00:00 2001 From: Cort Stratton Date: Wed, 22 Nov 2017 16:04:23 -0800 Subject: Fix build errors: - No more SPIRV-Tools revision file. Instead, the revision-parsing script just runs "git rev-parse HEAD" in the spirv-tools repository to extract the commit ID. - Invoke the revision-parsing script from the .sh Android scripts, in addition to the .bat scripts. --- scripts/external_revision_generator.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'scripts') diff --git a/scripts/external_revision_generator.py b/scripts/external_revision_generator.py index acfb42e3..34f71025 100644 --- a/scripts/external_revision_generator.py +++ b/scripts/external_revision_generator.py @@ -23,24 +23,17 @@ import os import subprocess import sys - - if __name__ == '__main__': if (len(sys.argv) != 4): - print("Usage: %s " % sys.argv[0]) + print("Usage: %s " % sys.argv[0]) sys.exit(os.EX_USAGE) - spirv_tools_source_dir = sys.argv[1] - spirv_tools_revision_file = sys.argv[2] + source_dir = sys.argv[1] + symbol_name = sys.argv[2] output_header_file = sys.argv[3] - # Load SPIRV-Tools revision - with open(spirv_tools_revision_file, "r") as rev_file: - revision = rev_file.read().replace('\n', '') - - # The revision listed in the file may be symbolic; use "git rev-parse" to - # convert it to a commit hash - spirv_tools_commit_id = subprocess.check_output(["git", "rev-parse", revision], cwd=spirv_tools_source_dir).decode('utf-8').strip() + # Extract commit ID from the specified source directory + commit_id = subprocess.check_output(["git", "rev-parse", "HEAD"], cwd=source_dir).decode('utf-8').strip() # Write commit ID to output header file with open(output_header_file, "w") as header_file: @@ -77,6 +70,6 @@ if __name__ == '__main__': header_file.write(copyright) # Contents contents = '#pragma once\n\n' - contents += '#define SPIRV_TOOLS_COMMIT_ID "' + spirv_tools_commit_id + '"\n' + contents += '#define %s "%s"\n' % (symbol_name, commit_id) header_file.write(contents) \ No newline at end of file -- cgit v1.2.3