From 360f032356fc09d69f61cdefafe37e2f94723869 Mon Sep 17 00:00:00 2001 From: "scottmg@chromium.org" Date: Sat, 22 Feb 2014 03:21:23 +0000 Subject: [PATCH] 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 --- .gitignore | 1 + win_toolchain/get_toolchain_if_necessary.py | 3 ++- win_toolchain/toolchain2013.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f63b39b6a..395a7ff85 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ /win_toolchain/vs2013_files /win_toolchain/.timestamps /win_toolchain/.vspro +/win_toolchain/data.json # Ignore ctags/cscope index files /TAGS diff --git a/win_toolchain/get_toolchain_if_necessary.py b/win_toolchain/get_toolchain_if_necessary.py index 4af2e7f7a..fb18ffc43 100755 --- a/win_toolchain/get_toolchain_if_necessary.py +++ b/win_toolchain/get_toolchain_if_necessary.py @@ -195,7 +195,8 @@ def main(): SaveTimestampsAndHash(target_dir, current_hash) 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 diff --git a/win_toolchain/toolchain2013.py b/win_toolchain/toolchain2013.py index 1ed216cd4..dd7ce2555 100755 --- a/win_toolchain/toolchain2013.py +++ b/win_toolchain/toolchain2013.py @@ -467,7 +467,7 @@ def main(): 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) finally: if options.clean: