godotengine/godot-angle-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-angle-static.git synced 2026-01-06 02:09:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Include script outputs in run_code_generation.py.

Browse Source 
This will prevent incorrect modifications to outputs from being checked
into the repository. Requires a few changes to some generators.

Bug: angleproject:3227
Change-Id: I5285cb78a9d85df155a5272edf8b6b8cd27fc04c
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1515212
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
This commit is contained in:
Jamie Madill
2019-03-12 11:18:15 -04:00
committed by Commit Bot
parent f576a708a3
commit 3c1f5a6bd4
4 changed files with 896 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
scripts/run_code_generation.py
View File

@@ -26,10 +26,10 @@ def get_child_script_dirname(script):
def clean_path_slashes(path):
return path.replace("\\", "/")
# Takes a script input file name which is relative to the code generation script's directory and
# Takes a script file name which is relative to the code generation script's directory and
# changes it to be relative to the angle root directory
def rebase_script_path(script_path, input_file_path):
return os.path.relpath(os.path.join(os.path.dirname(script_path), input_file_path), root_dir)
def rebase_script_path(script_path, relative_path):
return os.path.relpath(os.path.join(os.path.dirname(script_path), relative_path), root_dir)
def grab_from_script(script, param):
res = subprocess.check_output(['python', script, param]).strip()
@@ -41,10 +41,13 @@ def auto_script(script):
# Set the CWD to the script directory.
os.chdir(get_child_script_dirname(script))
base_script = os.path.basename(script)
return {
info = {
'inputs': grab_from_script(base_script, 'inputs'),
'outputs': grab_from_script(base_script, 'outputs')
}
# Reset the CWD to the root ANGLE directory.
os.chdir(root_dir)
return info
hash_fname = "run_code_generation_hashes.json"
@@ -98,23 +101,37 @@ def md5(fname):
return hash_md5.hexdigest()
def any_input_dirty(name, inputs, new_hashes, old_hashes):
found_dirty_input = False
for finput in inputs:
key = name + ":" + finput
new_hashes[key] = md5(finput)
if (not key in old_hashes) or (old_hashes[key] != new_hashes[key]):
found_dirty_input = True
return found_dirty_input
def any_hash_dirty(name, filenames, new_hashes, old_hashes):
found_dirty_hash = False
for filename in filenames:
key = name + ":" + filename
if not os.path.isfile(filename):
found_dirty_hash = True
else:
new_hashes[key] = md5(filename)
if (not key in old_hashes) or (old_hashes[key] != new_hashes[key]):
found_dirty_hash = True
return found_dirty_hash
def any_old_hash_missing(new_hashes, old_hashes):
for name, _ in old_hashes.iteritems():
if name not in new_hashes:
script, file = name.split(':')
print('%s missing from generated hashes.' % file)
return True
return False
def update_output_hashes(script, outputs, new_hashes):
for output in outputs:
if not os.path.isfile(output):
print('Output is missing from %s: %s' % (script, output))
sys.exit(1)
key = script + ":" + output
new_hashes[key] = md5(output)
def main():
os.chdir(script_dir)
old_hashes = json.load(open(hash_fname))
@@ -126,13 +143,9 @@ def main():
verify_only = True
for name, script in sorted(generators.iteritems()):
info = auto_script(script)
# Reset the CWD to the root ANGLE directory.
os.chdir(root_dir)
if any_input_dirty(name, info['inputs'] + [script], new_hashes, old_hashes):
filenames = info['inputs'] + info['outputs'] + [script]
if any_hash_dirty(name, filenames, new_hashes, old_hashes):
any_dirty = True
if not verify_only:
@@ -161,6 +174,11 @@ def main():
print('Calling git cl format')
subprocess.call(args)
# Update the output hashes again since they can be formatted.
for name, script in sorted(generators.iteritems()):
info = auto_script(script)
update_output_hashes(name, info['outputs'], new_hashes)
os.chdir(script_dir)
json.dump(new_hashes, open(hash_fname, "w"), indent=2, sort_keys=True,
separators=(',', ':\n '))