mirror of
https://github.com/electron/node-gyp.git
synced 2025-08-15 12:58:19 +02:00
gyp: assorted typo fixes
PR-URL: https://github.com/nodejs/node-gyp/pull/1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
parent
a301abcde1
commit
cdb47bd54d
13 changed files with 22 additions and 22 deletions
|
@ -550,7 +550,7 @@ class AndroidMkWriter(object):
|
|||
# to work properly. If the file has the wrong C++ extension, then we add
|
||||
# a rule to copy that to intermediates and use the new version.
|
||||
final_generated_sources = []
|
||||
# If a source file gets copied, we still need to add the orginal source
|
||||
# If a source file gets copied, we still need to add the original source
|
||||
# directory as header search path, for GCC searches headers in the
|
||||
# directory that contains the source file by default.
|
||||
origin_src_dirs = []
|
||||
|
|
|
@ -574,7 +574,7 @@ class CMakeNamer(object):
|
|||
"""Converts Gyp target names into CMake target names.
|
||||
|
||||
CMake requires that target names be globally unique. One way to ensure
|
||||
this is to fully qualify the names of the targets. Unfortunatly, this
|
||||
this is to fully qualify the names of the targets. Unfortunately, this
|
||||
ends up with all targets looking like "chrome_chrome_gyp_chrome" instead
|
||||
of just "chrome". If this generator were only interested in building, it
|
||||
would be possible to fully qualify all target names, then create
|
||||
|
|
|
@ -195,7 +195,7 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params,
|
|||
"""Calculate the defines for a project.
|
||||
|
||||
Returns:
|
||||
A dict that includes explict defines declared in gyp files along with all of
|
||||
A dict that includes explicit defines declared in gyp files along with all of
|
||||
the default defines that the compiler uses.
|
||||
"""
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
# all are sourced by the top-level Makefile. This means that all
|
||||
# variables in .mk-files clobber one another. Be careful to use :=
|
||||
# where appropriate for immediate evaluation, and similarly to watch
|
||||
# that you're not relying on a variable value to last beween different
|
||||
# that you're not relying on a variable value to last between different
|
||||
# .mk files.
|
||||
#
|
||||
# TODOs:
|
||||
|
|
|
@ -3069,7 +3069,7 @@ def _FinalizeMSBuildSettings(spec, configuration):
|
|||
_ToolAppend(msbuild_settings, 'ResourceCompile',
|
||||
'AdditionalIncludeDirectories', resource_include_dirs)
|
||||
# Add in libraries, note that even for empty libraries, we want this
|
||||
# set, to prevent inheriting default libraries from the enviroment.
|
||||
# set, to prevent inheriting default libraries from the environment.
|
||||
_ToolSetOrAppend(msbuild_settings, 'Link', 'AdditionalDependencies',
|
||||
libraries)
|
||||
_ToolAppend(msbuild_settings, 'Link', 'AdditionalLibraryDirectories',
|
||||
|
|
|
@ -1821,7 +1821,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
|
|||
# - The priority from low to high is gcc/g++, the 'make_global_settings' in
|
||||
# gyp, the environment variable.
|
||||
# - If there is no 'make_global_settings' for CC.host/CXX.host or
|
||||
# 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
|
||||
# 'CC_host'/'CXX_host' environment variable, cc_host/cxx_host should be set
|
||||
# to cc/cxx.
|
||||
if flavor == 'win':
|
||||
ar = 'lib.exe'
|
||||
|
|
|
@ -998,7 +998,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
|
|||
actions.append(action)
|
||||
|
||||
if len(concrete_outputs_all) > 0:
|
||||
# TODO(mark): There's a possibilty for collision here. Consider
|
||||
# TODO(mark): There's a possibility for collision here. Consider
|
||||
# target "t" rule "A_r" and target "t_A" rule "r".
|
||||
makefile_name = '%s.make' % re.sub(
|
||||
'[^a-zA-Z0-9_]', '_' , '%s_%s' % (target_name, rule['rule_name']))
|
||||
|
|
|
@ -1073,7 +1073,7 @@ def EvalSingleCondition(
|
|||
cond_expr, true_dict, false_dict, phase, variables, build_file):
|
||||
"""Returns true_dict if cond_expr evaluates to true, and false_dict
|
||||
otherwise."""
|
||||
# Do expansions on the condition itself. Since the conditon can naturally
|
||||
# Do expansions on the condition itself. Since the condition can naturally
|
||||
# contain variable references without needing to resort to GYP expansion
|
||||
# syntax, this is of dubious value for variables, but someone might want to
|
||||
# use a command expansion directly inside a condition.
|
||||
|
@ -1178,7 +1178,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
|
|||
continue
|
||||
if the_dict_key == 'variables' and variable_name in the_dict:
|
||||
# If the variable is set without a % in the_dict, and the_dict is a
|
||||
# variables dict (making |variables| a varaibles sub-dict of a
|
||||
# variables dict (making |variables| a variables sub-dict of a
|
||||
# variables dict), use the_dict's definition.
|
||||
value = the_dict[variable_name]
|
||||
else:
|
||||
|
@ -1864,7 +1864,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
|
|||
continue
|
||||
dependency_node = dependency_nodes.get(dependency_build_file)
|
||||
if not dependency_node:
|
||||
raise GypError("Dependancy '%s' not found" % dependency_build_file)
|
||||
raise GypError("Dependency '%s' not found" % dependency_build_file)
|
||||
if dependency_node not in build_file_node.dependencies:
|
||||
build_file_node.dependencies.append(dependency_node)
|
||||
dependency_node.dependents.append(build_file_node)
|
||||
|
|
|
@ -375,7 +375,7 @@ class MsvsSettings(object):
|
|||
return pdbname
|
||||
|
||||
def GetMapFileName(self, config, expand_special):
|
||||
"""Gets the explicitly overriden map file name for a target or returns None
|
||||
"""Gets the explicitly overridden map file name for a target or returns None
|
||||
if it's not set."""
|
||||
config = self._TargetConfig(config)
|
||||
map_file = self._Setting(('VCLinkerTool', 'MapFileName'), config)
|
||||
|
|
|
@ -778,7 +778,7 @@ class XcodeSettings(object):
|
|||
product_dir: The directory where products such static and dynamic
|
||||
libraries are placed. This is added to the library search path.
|
||||
gyp_to_build_path: A function that converts paths relative to the
|
||||
current gyp file to paths relative to the build direcotry.
|
||||
current gyp file to paths relative to the build directory.
|
||||
"""
|
||||
self.configname = configname
|
||||
ldflags = []
|
||||
|
@ -923,7 +923,7 @@ class XcodeSettings(object):
|
|||
|
||||
def _GetStripPostbuilds(self, configname, output_binary, quiet):
|
||||
"""Returns a list of shell commands that contain the shell commands
|
||||
neccessary to strip this target's binary. These should be run as postbuilds
|
||||
necessary to strip this target's binary. These should be run as postbuilds
|
||||
before the actual postbuilds run."""
|
||||
self.configname = configname
|
||||
|
||||
|
@ -957,7 +957,7 @@ class XcodeSettings(object):
|
|||
|
||||
def _GetDebugInfoPostbuilds(self, configname, output, output_binary, quiet):
|
||||
"""Returns a list of shell commands that contain the shell commands
|
||||
neccessary to massage this target's debug information. These should be run
|
||||
necessary to massage this target's debug information. These should be run
|
||||
as postbuilds before the actual postbuilds run."""
|
||||
self.configname = configname
|
||||
|
||||
|
@ -1052,7 +1052,7 @@ class XcodeSettings(object):
|
|||
# "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
|
||||
# library order and cause collision when building Chrome.
|
||||
#
|
||||
# Instead substitude ".tbd" to ".dylib" in the generated project when the
|
||||
# Instead substitute ".tbd" to ".dylib" in the generated project when the
|
||||
# following conditions are both true:
|
||||
# - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
|
||||
# - the ".dylib" file does not exists but a ".tbd" file do.
|
||||
|
@ -1341,7 +1341,7 @@ def GetStdout(cmdlist):
|
|||
def MergeGlobalXcodeSettingsToSpec(global_dict, spec):
|
||||
"""Merges the global xcode_settings dictionary into each configuration of the
|
||||
target represented by spec. For keys that are both in the global and the local
|
||||
xcode_settings dict, the local key gets precendence.
|
||||
xcode_settings dict, the local key gets precedence.
|
||||
"""
|
||||
# The xcode generator special-cases global xcode_settings and does something
|
||||
# that amounts to merging in the global xcode_settings into each local
|
||||
|
@ -1384,7 +1384,7 @@ def GetMacBundleResources(product_dir, xcode_settings, resources):
|
|||
output = dest
|
||||
|
||||
# The make generator doesn't support it, so forbid it everywhere
|
||||
# to keep the generators more interchangable.
|
||||
# to keep the generators more interchangeable.
|
||||
assert ' ' not in res, (
|
||||
"Spaces in resource filenames not supported (%s)" % res)
|
||||
|
||||
|
@ -1426,14 +1426,14 @@ def GetMacInfoPlist(product_dir, xcode_settings, gyp_path_to_build_path):
|
|||
relative to the build directory.
|
||||
xcode_settings: The XcodeSettings of the current target.
|
||||
gyp_to_build_path: A function that converts paths relative to the
|
||||
current gyp file to paths relative to the build direcotry.
|
||||
current gyp file to paths relative to the build directory.
|
||||
"""
|
||||
info_plist = xcode_settings.GetPerTargetSetting('INFOPLIST_FILE')
|
||||
if not info_plist:
|
||||
return None, None, [], {}
|
||||
|
||||
# The make generator doesn't support it, so forbid it everywhere
|
||||
# to keep the generators more interchangable.
|
||||
# to keep the generators more interchangeable.
|
||||
assert ' ' not in info_plist, (
|
||||
"Spaces in Info.plist filenames not supported (%s)" % info_plist)
|
||||
|
||||
|
|
|
@ -220,7 +220,7 @@ class XCObject(object):
|
|||
an empty string ("", in the case of property_type
|
||||
str) or list ([], in the case of is_list True) from
|
||||
being set for the property.
|
||||
default: Optional. If is_requried is True, default may be set
|
||||
default: Optional. If is_required is True, default may be set
|
||||
to provide a default value for objects that do not supply
|
||||
their own value. If is_required is True and default
|
||||
is not provided, users of the class must supply their own
|
||||
|
|
|
@ -18,7 +18,7 @@ COMMENT_RE = re.compile(r'\s*#.*')
|
|||
# Regex to remove quoted strings when we're counting braces.
|
||||
# It takes into account quoted quotes, and makes sure that the quotes match.
|
||||
# NOTE: It does not handle quotes that span more than one line, or
|
||||
# cases where an escaped quote is preceeded by an escaped backslash.
|
||||
# cases where an escaped quote is preceded by an escaped backslash.
|
||||
QUOTE_RE_STR = r'(?P<q>[\'"])(.*?)(?<![^\\][\\])(?P=q)'
|
||||
QUOTE_RE = re.compile(QUOTE_RE_STR)
|
||||
|
||||
|
|
|
@ -265,7 +265,7 @@ def MergeAttributes(node1, node2):
|
|||
if value1 != value2:
|
||||
node1.setAttribute(name, ';'.join([value1, value2]))
|
||||
else:
|
||||
# The attribute does nto exist in the main node. We append this one.
|
||||
# The attribute does not exist in the main node. We append this one.
|
||||
node1.setAttribute(name, value2)
|
||||
|
||||
# If the attribute was a property sheet attributes, we remove it, since
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue