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

Windows: Clarify custom toolchain env variable requirements (issue #1403)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-08-26 12:51:49 +03:00
parent 87ce1497b9
commit 80e473edf2
2 changed files with 72 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tools/gclient_hook.py
View File

@ -54,23 +54,60 @@ if platform == 'windows':
# By default GN/GYP+Ninja on Windows expects Visual Studio to be installed on
# the local machine. To build when Visual Studio is extracted to a directory
# but not installed (e.g. via a custom toolchain):
#
# o Enable use of a custom toolchain on Windows.
#
# set WIN_CUSTOM_TOOLCHAIN=1
#
# o Used by tools/msvs_env.bat to configure the MSVS tools environment.
# Should be set to "none" because VC variables for CEF will be set via
# INCLUDE/LIB/PATH.
# TODO(cef): Make INCLUDE/LIB/PATH values optional when
# "%VS_ROOT%\VC\vcvarsall.bat" exists (use those values instead).
#
# set CEF_VCVARS=none
#
# o Used by the following scripts:
# (a) build/vs_toolchain.py SetEnvironmentAndGetRuntimeDllDirs when
# determining whether to copy VS runtime binaries to the output directory.
# If GYP_MSVS_OVERRIDE_PATH exists then binaries will not be copied and
# should instead be discoverable via the PATH env variable.
# (b) build/toolchain/win/setup_toolchain.py _LoadToolchainEnv when
# writing environment.* files that specify INCLUDE/LIB/PATH values. If
# "%GYP_MSVS_OVERRIDE_PATH%\VC\vcvarsall.bat" exists then environment
# variables will be derived from there and the specified INCLUDE/LIB/PATH
# values, if any, will be ignored by Chromium. If this file does not exist
# then the INCLUDE/LIB/PATH values are also required by Chromium.
# TODO(cef): Rename to VS_PATH and VS_VERSION after Chromium cleans up GYP
# dependencies.
#
# set GYP_MSVS_OVERRIDE_PATH=<VS root directory>
# set GYP_MSVS_VERSION=<VS version>
# set VS_ROOT=<VS root directory>
#
# o Used to configure GN and GYP arguments in this script.
#
# set VS_CRT_ROOT=<VS CRT root directory> (GN only)
# set SDK_ROOT=<Platform SDK root directory>
#
# o Used by various scripts as described above.
#
# set INCLUDE=<VS include paths>
# set PATH=<VS executable paths>
# set LIB=<VS library paths>
# set PATH=<VS executable paths>
#
# See tools/depot_tools/win_toolchain/package_from_installed.py for an example
# packaging script along with required directory contents and INCLUDE/LIB/PATH
# values.
#
if bool(int(os.environ.get('WIN_CUSTOM_TOOLCHAIN', '0'))):
required_vars = [
'CEF_VCVARS',
'GYP_MSVS_OVERRIDE_PATH',
'GYP_MSVS_VERSION',
'VS_ROOT',
'SDK_ROOT',
'INCLUDE',
'PATH',
'LIB',
'PATH',
]
if use_gn:
required_vars.append('VS_CRT_ROOT')
@ -80,16 +117,9 @@ if platform == 'windows':
custom_toolchain = True
# VC variables will be set via INCLUDE/PATH/LIB.
os.environ['CEF_VCVARS'] = 'none'
# Necessary to return correct VS version information via GetVSVersion in
# src/tools/gyp/pylib/gyp/msvs_emulation.py.
os.environ['GYP_MSVS_OVERRIDE_PATH'] = os.environ['VS_ROOT']
if use_gn:
# Windows custom toolchain requirements. See comments in gn_args.py.
gn_args['visual_studio_path'] = os.environ['VS_ROOT']
gn_args['visual_studio_path'] = os.environ['GYP_MSVS_OVERRIDE_PATH']
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']