From 222bc2d907e81daa3c1d762e38c1ad3d691eef1a Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Thu, 28 Dec 2017 12:39:51 -0500 Subject: layers: Fix git.bat fallback on Windows. This fixes the external revision generator script to first try to use 'git', then fall back to 'git.bat' if the first invocation throws a WindowsError. --- scripts/external_revision_generator.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'scripts') diff --git a/scripts/external_revision_generator.py b/scripts/external_revision_generator.py index bdfe3549..30701174 100644 --- a/scripts/external_revision_generator.py +++ b/scripts/external_revision_generator.py @@ -23,20 +23,9 @@ import os import subprocess import sys -if __name__ == '__main__': - if (len(sys.argv) != 4): - print("Usage: %s " % sys.argv[0]) - sys.exit(os.EX_USAGE) - - source_dir = sys.argv[1] - symbol_name = sys.argv[2] - output_header_file = sys.argv[3] - - # Extract commit ID from the specified source directory - # Call git.bat on Windows for compatiblity. - git_binary = "git.bat" if os == "nt" else "git" +def generate(git_binary): commit_id = subprocess.check_output([git_binary, "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: # File Comment @@ -74,4 +63,19 @@ if __name__ == '__main__': contents = '#pragma once\n\n' contents += '#define %s "%s"\n' % (symbol_name, commit_id) header_file.write(contents) - \ No newline at end of file + +if __name__ == '__main__': + if (len(sys.argv) != 4): + print("Usage: %s " % sys.argv[0]) + sys.exit(os.EX_USAGE) + + source_dir = sys.argv[1] + symbol_name = sys.argv[2] + output_header_file = sys.argv[3] + + # Extract commit ID from the specified source directory + try: + generate('git') + except WindowsError: + # Call git.bat on Windows for compatiblity. + generate('git.bat') -- cgit v1.2.3