Commit 360f0323 authored by scottmg@chromium.org's avatar scottmg@chromium.org

Move data.json to win_toolchain to its abs paths aren't hashed

TBR=iannucci@chromium.org
BUG=323300

Review URL: https://codereview.chromium.org/173523005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252737 0039d316-1c4b-4281-b951-d872f2087c98
parent be6b308f
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
/win_toolchain/vs2013_files /win_toolchain/vs2013_files
/win_toolchain/.timestamps /win_toolchain/.timestamps
/win_toolchain/.vspro /win_toolchain/.vspro
/win_toolchain/data.json
# Ignore ctags/cscope index files # Ignore ctags/cscope index files
/TAGS /TAGS
......
...@@ -195,7 +195,8 @@ def main(): ...@@ -195,7 +195,8 @@ def main():
SaveTimestampsAndHash(target_dir, current_hash) SaveTimestampsAndHash(target_dir, current_hash)
if options.output_json: if options.output_json:
shutil.copyfile(os.path.join(target_dir, 'data.json'), options.output_json) shutil.copyfile(os.path.join(target_dir, '..', 'data.json'),
options.output_json)
return 0 return 0
......
...@@ -467,7 +467,7 @@ def main(): ...@@ -467,7 +467,7 @@ def main():
os.path.join(target_dir, 'sys32'), os.path.join(target_dir, 'sys32'),
], ],
} }
with open(os.path.join(target_dir, 'data.json'), 'w') as f: with open(os.path.join(target_dir, '..', 'data.json'), 'w') as f:
json.dump(data, f) json.dump(data, f)
finally: finally:
if options.clean: if options.clean:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment