diff options
Diffstat (limited to 'scripts/generate_source.py')
-rwxr-xr-x | scripts/generate_source.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/generate_source.py b/scripts/generate_source.py index 3c448adf3..db350c6e3 100755 --- a/scripts/generate_source.py +++ b/scripts/generate_source.py @@ -19,7 +19,6 @@ # Author: Mike Schuchardt <mikes@lunarg.com> import argparse -import common_codegen import filecmp import os import shutil @@ -27,6 +26,8 @@ import subprocess import sys import tempfile +import common_codegen + # files to exclude from --verify check verify_exclude = ['.clang-format'] @@ -63,7 +64,8 @@ def main(argv): os.path.abspath(os.path.join(args.registry, 'validusage.json')), '-export_header'], [common_codegen.repo_relative('scripts/external_revision_generator.py'), - '--rev_file', common_codegen.repo_relative('scripts/known_good.json'), + '--json_file', common_codegen.repo_relative('scripts/known_good.json'), + '--json_keys', 'repos,0,commit', '-s', 'SPIRV_TOOLS_COMMIT_ID', '-o', 'spirv_tools_commit_id.h']] @@ -83,10 +85,7 @@ def main(argv): for cmd in gen_cmds: print(' '.join(cmd)) try: - subprocess.check_call([sys.executable] + cmd, - # ignore generator output, vk_validation_stats.py is especially noisy - stdout=subprocess.DEVNULL, - cwd=gen_dir) + subprocess.check_call([sys.executable] + cmd, cwd=gen_dir) except Exception as e: print('ERROR:', str(e)) return 1 |