Clang update.py: Add --package option

and use that to download auxiliary packages, removing the custom scripts
previously used to do that.

Bug: 884608
Change-Id: Iefcd2145898588a6dbdc14c21841201f9d17f8c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1605911
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#712644}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 8ee64a1ef7f2c6cc1361415b4aecac32311d4a28

download_libclang.py

@@ -5,50 +5,16 @@
 
 """Script to download libclang binaries from google storage."""
 
-import find_depot_tools
-import json
 import os
-import shutil
-import subprocess
 import sys
-import tarfile
 
-SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-CHROME_SRC = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir))
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..',
+                             'tools', 'clang', 'scripts'))
 
+import update
 
-DEPOT_PATH = find_depot_tools.add_depot_tools_to_path()
-GSUTIL_PATH = os.path.join(DEPOT_PATH, 'gsutil.py')
-
-LLVM_BUILD_PATH = os.path.join(CHROME_SRC, 'third_party', 'llvm-build',
-                               'Release+Asserts')
-CLANG_UPDATE_PY = os.path.join(CHROME_SRC, 'tools', 'clang', 'scripts',
-                               'update.py')
-
-CLANG_BUCKET = 'gs://chromium-browser-clang'
-
-
-def main():
-  clang_revision = subprocess.check_output([sys.executable, CLANG_UPDATE_PY,
-                                            '--print-revision']).rstrip()
-  targz_name = 'libclang-%s.tgz' % clang_revision
-
-  if sys.platform == 'win32' or sys.platform == 'cygwin':
-    cds_full_url = CLANG_BUCKET + '/Win/' + targz_name
-  elif sys.platform == 'darwin':
-    cds_full_url = CLANG_BUCKET + '/Mac/' + targz_name
-  else:
-    assert sys.platform.startswith('linux')
-    cds_full_url = CLANG_BUCKET + '/Linux_x64/' + targz_name
-
-  os.chdir(LLVM_BUILD_PATH)
-
-  subprocess.check_call([sys.executable, GSUTIL_PATH,
-                         'cp', cds_full_url, targz_name])
-  tarfile.open(name=targz_name, mode='r:gz').extractall(path=LLVM_BUILD_PATH)
-
-  os.remove(targz_name)
-  return 0
-
+# TODO(hans): Remove this forwarding hack after all callers of this script have
+# been updated to call update.py instead.
 if __name__ == '__main__':
-  sys.exit(main())
+  sys.argv = [sys.argv[0], '--package=libclang']
+  sys.exit(update.main())

download_translation_unit_tool.py

@@ -3,52 +3,16 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Script to download Clang translation_unit tool from google storage."""
-
-import find_depot_tools
-import json
 import os
-import shutil
-import subprocess
 import sys
-import tarfile
 
-SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-CHROME_SRC = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir))
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..',
+                             'tools', 'clang', 'scripts'))
 
+import update
 
-DEPOT_PATH = find_depot_tools.add_depot_tools_to_path()
-GSUTIL_PATH = os.path.join(DEPOT_PATH, 'gsutil.py')
-
-LLVM_BUILD_PATH = os.path.join(CHROME_SRC, 'third_party', 'llvm-build',
-                               'Release+Asserts')
-CLANG_UPDATE_PY = os.path.join(CHROME_SRC, 'tools', 'clang', 'scripts',
-                               'update.py')
-
-CLANG_BUCKET = 'gs://chromium-browser-clang'
-
-
-def main():
-  clang_revision = subprocess.check_output([sys.executable, CLANG_UPDATE_PY,
-                                            '--print-revision']).rstrip()
-  targz_name = 'translation_unit-%s.tgz' % clang_revision
-
-  if sys.platform == 'win32' or sys.platform == 'cygwin':
-    cds_full_url = CLANG_BUCKET + '/Win/' + targz_name
-  elif sys.platform == 'darwin':
-    cds_full_url = CLANG_BUCKET + '/Mac/' + targz_name
-  else:
-    assert sys.platform.startswith('linux')
-    cds_full_url = CLANG_BUCKET + '/Linux_x64/' + targz_name
-
-  os.chdir(LLVM_BUILD_PATH)
-
-  subprocess.check_call([sys.executable, GSUTIL_PATH,
-                         'cp', cds_full_url, targz_name])
-  tarfile.open(name=targz_name, mode='r:gz').extractall(path=LLVM_BUILD_PATH)
-
-  os.remove(targz_name)
-  return 0
-
+# TODO(hans): Remove this forwarding hack after all callers of this script have
+# been updated to call update.py instead.
 if __name__ == '__main__':
-  sys.exit(main())
+  sys.argv = [sys.argv[0], '--package=translation_unit']
+  sys.exit(update.main())