bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix documentation errors

This commit is contained in:
Marshall Greenblatt 2016-08-26 13:22:22 +03:00
parent ae452e5348
commit 9ee4db6dbb
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/gclient_hook.py
View File

@ -59,8 +59,6 @@ if platform == 'windows':
# o Used by tools/msvs_env.bat to configure the MSVS tools environment. # 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 # Should be set to "none" because VC variables for CEF will be set via
# INCLUDE/LIB/PATH. # 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 # set CEF_VCVARS=none
# #
@ -73,9 +71,9 @@ if platform == 'windows':
# writing environment.* files that specify INCLUDE/LIB/PATH values. If # writing environment.* files that specify INCLUDE/LIB/PATH values. If
# "%GYP_MSVS_OVERRIDE_PATH%\VC\vcvarsall.bat" exists then environment # "%GYP_MSVS_OVERRIDE_PATH%\VC\vcvarsall.bat" exists then environment
# variables will be derived from there and the specified INCLUDE/LIB/PATH # 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 # values will be ignored by Chromium. If this file does not exist then the
# then the INCLUDE/LIB/PATH values are also required by Chromium. # INCLUDE/LIB/PATH values are also required by Chromium.
# TODO(cef): Rename to VS_PATH and VS_VERSION after Chromium cleans up GYP # TODO(cef): Rename to VS_ROOT and VS_VERSION after Chromium cleans up GYP
# dependencies. # dependencies.
# #
# set GYP_MSVS_OVERRIDE_PATH=<VS root directory> # set GYP_MSVS_OVERRIDE_PATH=<VS root directory>
@ -87,6 +85,9 @@ if platform == 'windows':
# set SDK_ROOT=<Platform SDK root directory> # set SDK_ROOT=<Platform SDK root directory>
# #
# o Used by various scripts as described above. # o Used by various scripts as described above.
# TODO(cef): Make these values optional when
# "%GYP_MSVS_OVERRIDE_PATH%\VC\vcvarsall.bat" exists (use values from that
# script instead).
# #
# set INCLUDE=<VS include paths> # set INCLUDE=<VS include paths>
# set LIB=<VS library paths> # set LIB=<VS library paths>

6
tools/gn_args.py
View File

@ -261,9 +261,9 @@ def ValidateArgs(args):
and 'PATH' in os.environ, \ and 'PATH' in os.environ, \
"visual_studio_path requires INCLUDE, LIB and PATH env variables" "visual_studio_path requires INCLUDE, LIB and PATH env variables"
# If "%VS_ROOT%\VC\vcvarsall.bat" exists then environment variables will # If "%GYP_MSVS_OVERRIDE_PATH%\VC\vcvarsall.bat" exists then environment
# be derived from there and the specified INCLUDE/LIB/PATH values, if any, # variables will be derived from there and the specified INCLUDE/LIB/PATH
# will be ignored by Chromium. If this file does not exist then the # values will be ignored by Chromium. If this file does not exist then the
# INCLUDE/LIB/PATH values are also required by Chromium. # INCLUDE/LIB/PATH values are also required by Chromium.
vcvars_path = os.path.join(msvs_path, 'VC', 'vcvarsall.bat') vcvars_path = os.path.join(msvs_path, 'VC', 'vcvarsall.bat')
if (os.path.exists(vcvars_path)): if (os.path.exists(vcvars_path)):