| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """This script is used to download prebuilt clang binaries. | 6 """This script is used to download prebuilt clang binaries. |
| 7 | 7 |
| 8 It is also used by package.py to build the prebuilt clang binaries.""" | 8 It is also used by package.py to build the prebuilt clang binaries.""" |
| 9 | 9 |
| 10 import argparse | 10 import argparse |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 # Try using the toolchain in depot_tools. | 357 # Try using the toolchain in depot_tools. |
| 358 # This sets environment variables used by SelectVisualStudioVersion below. | 358 # This sets environment variables used by SelectVisualStudioVersion below. |
| 359 sys.path.append(os.path.join(CHROMIUM_DIR, 'build')) | 359 sys.path.append(os.path.join(CHROMIUM_DIR, 'build')) |
| 360 import vs_toolchain | 360 import vs_toolchain |
| 361 vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() | 361 vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() |
| 362 | 362 |
| 363 # Use gyp to find the MSVS installation, either in depot_tools as per above, | 363 # Use gyp to find the MSVS installation, either in depot_tools as per above, |
| 364 # or a system-wide installation otherwise. | 364 # or a system-wide installation otherwise. |
| 365 sys.path.append(os.path.join(CHROMIUM_DIR, 'tools', 'gyp', 'pylib')) | 365 sys.path.append(os.path.join(CHROMIUM_DIR, 'tools', 'gyp', 'pylib')) |
| 366 import gyp.MSVSVersion | 366 import gyp.MSVSVersion |
| 367 #if 'GYP_MSVS_OVERRIDE_PATH' in os.environ: |
| 368 # return gyp.MSVSVersion.VisualStudioVersion('2017', |
| 369 # 'Visual Studio 2017', |
| 370 # solution_version='12.00', |
| 371 # project_version='15.0', |
| 372 # flat_sln=False, |
| 373 # uses_vcxproj=True, |
| 374 # path=os.environ['GYP_MSVS_OVERRIDE_PATH'], |
| 375 # sdk_based=False, |
| 376 # default_toolset='v141') |
| 367 vs_version = gyp.MSVSVersion.SelectVisualStudioVersion( | 377 vs_version = gyp.MSVSVersion.SelectVisualStudioVersion( |
| 368 vs_toolchain.GetVisualStudioVersion()) | 378 vs_toolchain.GetVisualStudioVersion()) |
| 369 return vs_version | 379 return vs_version |
| 370 | 380 |
| 371 | 381 |
| 372 def CopyDiaDllTo(target_dir): | 382 def CopyDiaDllTo(target_dir): |
| 373 # This script always wants to use the 64-bit msdia*.dll. | 383 # This script always wants to use the 64-bit msdia*.dll. |
| 374 dia_path = os.path.join(GetVSVersion().Path(), 'DIA SDK', 'bin', 'amd64') | 384 dia_path = os.path.join(GetVSVersion().Path(), 'DIA SDK', 'bin', 'amd64') |
| 375 dia_dll = os.path.join(dia_path, DIA_DLL[GetVSVersion().ShortName()]) | 385 dia_dll = os.path.join(dia_path, DIA_DLL[GetVSVersion().ShortName()]) |
| 376 CopyFile(dia_dll, target_dir) | 386 CopyFile(dia_dll, target_dir) |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 args.force_local_build = True | 918 args.force_local_build = True |
| 909 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): | 919 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): |
| 910 # Only build the Android ASan rt on ToT bots when targetting Android. | 920 # Only build the Android ASan rt on ToT bots when targetting Android. |
| 911 args.with_android = False | 921 args.with_android = False |
| 912 | 922 |
| 913 return UpdateClang(args) | 923 return UpdateClang(args) |
| 914 | 924 |
| 915 | 925 |
| 916 if __name__ == '__main__': | 926 if __name__ == '__main__': |
| 917 sys.exit(main()) | 927 sys.exit(main()) |
| OLD | NEW |