bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

win: Add windows_sdk_version GN arg (see https://crbug.com/1420723)

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-03-02 12:12:02 -05:00
parent 584b19967a
commit ae9ede9aa6
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/gclient_hook.py
View File

@@ -93,6 +93,7 @@ if platform == 'windows':
#
# set VS_CRT_ROOT=<VS CRT root directory>
# set SDK_ROOT=<Platform SDK root directory>
# set SDK_VERSION=<Platform SDK version>
#
# o Used by various scripts as described above. These values are optional when
# vcvarsall.bat [1] exists.
@@ -119,6 +120,7 @@ if platform == 'windows':
'GYP_MSVS_VERSION',
'VS_CRT_ROOT',
'SDK_ROOT',
'SDK_VERSION',
]
for var in required_vars:
if not var in os.environ.keys():
@@ -129,6 +131,7 @@ if platform == 'windows':
gn_args['visual_studio_version'] = os.environ['GYP_MSVS_VERSION']
gn_args['visual_studio_runtime_dirs'] = os.environ['VS_CRT_ROOT']
gn_args['windows_sdk_path'] = os.environ['SDK_ROOT']
gn_args['windows_sdk_version'] = os.environ['SDK_VERSION']
configs = GetAllPlatformConfigs(gn_args)
for dir, config in configs.items():

5
tools/gn_args.py
View File

@@ -183,6 +183,7 @@ def GetChromiumDefaultArgs():
defaults['visual_studio_version'] = ''
defaults['visual_studio_runtime_dirs'] = ''
defaults['windows_sdk_path'] = ''
defaults['windows_sdk_version'] = ''
return defaults
@@ -347,6 +348,7 @@ def ValidateArgs(args):
visual_studio_version = GetArgValue(args, 'visual_studio_version')
visual_studio_runtime_dirs = GetArgValue(args, 'visual_studio_runtime_dirs')
windows_sdk_path = GetArgValue(args, 'windows_sdk_path')
windows_sdk_version = GetArgValue(args, 'windows_sdk_version')
# Target CPU architecture.
# - Windows supports "x86", "x64" and "arm64".
@@ -400,6 +402,8 @@ def ValidateArgs(args):
# windows_sdk_path="<path to WinSDK>"
# The directory that contains the Win SDK. For example, a subset of
# "C:\Program Files (x86)\Windows Kits\10".
# windows_sdk_version="<WinSDK version>"
# The WinSDK version. For example, "10.0.22621.0".
#
# Required environment variables:
# DEPOT_TOOLS_WIN_TOOLCHAIN=0
@@ -418,6 +422,7 @@ def ValidateArgs(args):
assert visual_studio_version != '', 'visual_studio_path requires visual_studio_version'
assert visual_studio_runtime_dirs != '', 'visual_studio_path requires visual_studio_runtime_dirs'
assert windows_sdk_path != '', 'visual_studio_path requires windows_sdk_path'
assert windows_sdk_version != '', 'visual_studio_path requires windows_sdk_version'
assert os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '') == '0', \
"visual_studio_path requires DEPOT_TOOLS_WIN_TOOLCHAIN=0 env variable"