Quellcode durchsuchen

[win_toolchain] Update toolchain version

Chromium has now switched to MSVS2022+SDK22621 toolchain.
We should update some parameters and annotations in the file
to avoid inconsistent situations.

After applying this patch locally, no abnormal situation
is found. We can pack the toolchain normally.

Change-Id: I10ca115a076001efaa2b020251f2e448622598dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4297895
Auto-Submit: Ho Cheung <uioptt24@gmail.com>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Ho Cheung vor 2 Jahren
Ursprung
Commit
d437c34c1c
1 geänderte Dateien mit 6 neuen und 6 gelöschten Zeilen
  1. 6 6
      win_toolchain/package_from_installed.py

+ 6 - 6
win_toolchain/package_from_installed.py

@@ -24,7 +24,7 @@ frameworks-> Visual C++ MFC for ARM64 (which also brings in ATL for ARM64).
 3. Use Add or Remove Programs to find the Windows SDK installed with VS
 and modify it to include the debuggers.
 4. Run this script, which will build a <sha1>.zip, something like this:
-  python package_from_installed.py 2019|2022 -w 10.0.17763.0|<SDK version>
+  python package_from_installed.py 2022 -w 10.0.22621.0|<SDK version>
 
 Express is not yet supported by this script, but patches welcome (it's not too
 useful as the resulting zip can't be redistributed, and most will presumably
@@ -51,7 +51,7 @@ import get_toolchain_if_necessary
 _vs_version = None
 _win_version = None
 _vc_tools = None
-SUPPORTED_VS_VERSIONS = ['2019', '2022']
+SUPPORTED_VS_VERSIONS = ['2022']
 _allow_multiple_vs_installs = False
 
 
@@ -481,11 +481,11 @@ def main():
   if sys.version_info[0] < 3:
     print('This script requires Python 3')
     sys.exit(10)
-  usage = 'usage: %prog [options] 2019|2022'
+  usage = 'usage: %prog [options] 2022'
   parser = optparse.OptionParser(usage)
   parser.add_option('-w', '--winver', action='store', type='string',
-                    dest='winver', default='10.0.18362.0',
-                    help='Windows SDK version, such as 10.0.18362.0')
+                    dest='winver', default='10.0.22621.0',
+                    help='Windows SDK version, such as 10.0.22621.0')
   parser.add_option('-d', '--dryrun', action='store_true', dest='dryrun',
                     default=False,
                     help='scan for file existence and prints statistics')
@@ -507,7 +507,7 @@ def main():
     files = BuildRepackageFileList(options.repackage_dir)
   else:
     if len(args) != 1 or args[0] not in SUPPORTED_VS_VERSIONS:
-      print('Must specify 2019 or 2022')
+      print('Must specify 2022')
       parser.print_help();
       return 1