Commit 06019ba

Browse files
XhmikosRrvagg
authored andcommitted
gyp: assorted typo fixes
PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3f4972c commit 06019ba

13 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎gyp/pylib/gyp/generator/android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ def WriteSources(self, spec, configs, extra_sources):
550550
# to work properly. If the file has the wrong C++ extension, then we add
551551
# a rule to copy that to intermediates and use the new version.
552552
final_generated_sources= []
553-
# If a source file gets copied, we still need to add the orginal source
553+
# If a source file gets copied, we still need to add the original source
554554
# directory as header search path, for GCC searches headers in the
555555
# directory that contains the source file by default.
556556
origin_src_dirs= []

‎gyp/pylib/gyp/generator/cmake.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class CMakeNamer(object):
574574
"""Converts Gyp target names into CMake target names.
575575
576576
CMake requires that target names be globally unique. One way to ensure
577-
this is to fully qualify the names of the targets. Unfortunatly, this
577+
this is to fully qualify the names of the targets. Unfortunately, this
578578
ends up with all targets looking like "chrome_chrome_gyp_chrome" instead
579579
of just "chrome". If this generator were only interested in building, it
580580
would be possible to fully qualify all target names, then create

‎gyp/pylib/gyp/generator/eclipse.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params,
195195
"""Calculate the defines for a project.
196196
197197
Returns:
198-
A dict that includes explict defines declared in gyp files along with all of
198+
A dict that includes explicit defines declared in gyp files along with all of
199199
the default defines that the compiler uses.
200200
"""
201201

‎gyp/pylib/gyp/generator/make.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# all are sourced by the top-level Makefile. This means that all
1313
# variables in .mk-files clobber one another. Be careful to use :=
1414
# where appropriate for immediate evaluation, and similarly to watch
15-
# that you're not relying on a variable value to last beween different
15+
# that you're not relying on a variable value to last between different
1616
# .mk files.
1717
#
1818
# TODOs:

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3069,7 +3069,7 @@ def _FinalizeMSBuildSettings(spec, configuration):
30693069
_ToolAppend(msbuild_settings, 'ResourceCompile',
30703070
'AdditionalIncludeDirectories', resource_include_dirs)
30713071
# Add in libraries, note that even for empty libraries, we want this
3072-
# set, to prevent inheriting default libraries from the enviroment.
3072+
# set, to prevent inheriting default libraries from the environment.
30733073
_ToolSetOrAppend(msbuild_settings, 'Link', 'AdditionalDependencies',
30743074
libraries)
30753075
_ToolAppend(msbuild_settings, 'Link', 'AdditionalLibraryDirectories',

‎gyp/pylib/gyp/generator/ninja.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
18211821
# - The priority from low to high is gcc/g++, the 'make_global_settings' in
18221822
# gyp, the environment variable.
18231823
# - If there is no 'make_global_settings' for CC.host/CXX.host or
1824-
# 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
1824+
# 'CC_host'/'CXX_host' environment variable, cc_host/cxx_host should be set
18251825
# to cc/cxx.
18261826
ifflavor=='win':
18271827
ar='lib.exe'

‎gyp/pylib/gyp/generator/xcode.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
998998
actions.append(action)
999999

10001000
iflen(concrete_outputs_all) >0:
1001-
# TODO(mark): There's a possibilty for collision here. Consider
1001+
# TODO(mark): There's a possibility for collision here. Consider
10021002
# target "t" rule "A_r" and target "t_A" rule "r".
10031003
makefile_name='%s.make'%re.sub(
10041004
'[^a-zA-Z0-9_]', '_' , '%s_%s'% (target_name, rule['rule_name']))

‎gyp/pylib/gyp/input.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ def EvalSingleCondition(
10731073
cond_expr, true_dict, false_dict, phase, variables, build_file):
10741074
"""Returns true_dict if cond_expr evaluates to true, and false_dict
10751075
otherwise."""
1076-
# Do expansions on the condition itself. Since the conditon can naturally
1076+
# Do expansions on the condition itself. Since the condition can naturally
10771077
# contain variable references without needing to resort to GYP expansion
10781078
# syntax, this is of dubious value for variables, but someone might want to
10791079
# use a command expansion directly inside a condition.
@@ -1178,7 +1178,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
11781178
continue
11791179
ifthe_dict_key=='variables'andvariable_nameinthe_dict:
11801180
# If the variable is set without a % in the_dict, and the_dict is a
1181-
# variables dict (making |variables| a varaibles sub-dict of a
1181+
# variables dict (making |variables| a variables sub-dict of a
11821182
# variables dict), use the_dict's definition.
11831183
value=the_dict[variable_name]
11841184
else:
@@ -1864,7 +1864,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
18641864
continue
18651865
dependency_node=dependency_nodes.get(dependency_build_file)
18661866
ifnotdependency_node:
1867-
raiseGypError("Dependancy '%s' not found"%dependency_build_file)
1867+
raiseGypError("Dependency '%s' not found"%dependency_build_file)
18681868
ifdependency_nodenotinbuild_file_node.dependencies:
18691869
build_file_node.dependencies.append(dependency_node)
18701870
dependency_node.dependents.append(build_file_node)

‎gyp/pylib/gyp/msvs_emulation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def GetCompilerPdbName(self, config, expand_special):
375375
returnpdbname
376376

377377
defGetMapFileName(self, config, expand_special):
378-
"""Gets the explicitly overriden map file name for a target or returns None
378+
"""Gets the explicitly overridden map file name for a target or returns None
379379
if it's not set."""
380380
config=self._TargetConfig(config)
381381
map_file=self._Setting(('VCLinkerTool', 'MapFileName'), config)

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
778778
product_dir: The directory where products such static and dynamic
779779
libraries are placed. This is added to the library search path.
780780
gyp_to_build_path: A function that converts paths relative to the
781-
current gyp file to paths relative to the build direcotry.
781+
current gyp file to paths relative to the build directory.
782782
"""
783783
self.configname=configname
784784
ldflags= []
@@ -923,7 +923,7 @@ def GetPerTargetSetting(self, setting, default=None):
923923

924924
def_GetStripPostbuilds(self, configname, output_binary, quiet):
925925
"""Returns a list of shell commands that contain the shell commands
926-
neccessary to strip this target's binary. These should be run as postbuilds
926+
necessary to strip this target's binary. These should be run as postbuilds
927927
before the actual postbuilds run."""
928928
self.configname=configname
929929

@@ -957,7 +957,7 @@ def _GetStripPostbuilds(self, configname, output_binary, quiet):
957957

958958
def_GetDebugInfoPostbuilds(self, configname, output, output_binary, quiet):
959959
"""Returns a list of shell commands that contain the shell commands
960-
neccessary to massage this target's debug information. These should be run
960+
necessary to massage this target's debug information. These should be run
961961
as postbuilds before the actual postbuilds run."""
962962
self.configname=configname
963963

@@ -1052,7 +1052,7 @@ def _AdjustLibrary(self, library, config_name=None):
10521052
# "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
10531053
# library order and cause collision when building Chrome.
10541054
#
1055-
# Instead substitude ".tbd" to ".dylib" in the generated project when the
1055+
# Instead substitute ".tbd" to ".dylib" in the generated project when the
10561056
# following conditions are both true:
10571057
# - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
10581058
# - the ".dylib" file does not exists but a ".tbd" file do.
@@ -1341,7 +1341,7 @@ def GetStdout(cmdlist):
13411341
defMergeGlobalXcodeSettingsToSpec(global_dict, spec):
13421342
"""Merges the global xcode_settings dictionary into each configuration of the
13431343
target represented by spec. For keys that are both in the global and the local
1344-
xcode_settings dict, the local key gets precendence.
1344+
xcode_settings dict, the local key gets precedence.
13451345
"""
13461346
# The xcode generator special-cases global xcode_settings and does something
13471347
# that amounts to merging in the global xcode_settings into each local
@@ -1384,7 +1384,7 @@ def GetMacBundleResources(product_dir, xcode_settings, resources):
13841384
output=dest
13851385

13861386
# The make generator doesn't support it, so forbid it everywhere
1387-
# to keep the generators more interchangable.
1387+
# to keep the generators more interchangeable.
13881388
assert' 'notinres, (
13891389
"Spaces in resource filenames not supported (%s)"%res)
13901390

@@ -1426,14 +1426,14 @@ def GetMacInfoPlist(product_dir, xcode_settings, gyp_path_to_build_path):
14261426
relative to the build directory.
14271427
xcode_settings: The XcodeSettings of the current target.
14281428
gyp_to_build_path: A function that converts paths relative to the
1429-
current gyp file to paths relative to the build direcotry.
1429+
current gyp file to paths relative to the build directory.
14301430
"""
14311431
info_plist=xcode_settings.GetPerTargetSetting('INFOPLIST_FILE')
14321432
ifnotinfo_plist:
14331433
returnNone, None, [], {}
14341434

14351435
# The make generator doesn't support it, so forbid it everywhere
1436-
# to keep the generators more interchangable.
1436+
# to keep the generators more interchangeable.
14371437
assert' 'notininfo_plist, (
14381438
"Spaces in Info.plist filenames not supported (%s)"%info_plist)
14391439

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit 06019ba

Browse files
XhmikosRrvagg
authored andcommitted
gyp: assorted typo fixes
PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3f4972c commit 06019ba

13 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎gyp/pylib/gyp/generator/android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ def WriteSources(self, spec, configs, extra_sources):
550550
# to work properly. If the file has the wrong C++ extension, then we add
551551
# a rule to copy that to intermediates and use the new version.
552552
final_generated_sources= []
553-
# If a source file gets copied, we still need to add the orginal source
553+
# If a source file gets copied, we still need to add the original source
554554
# directory as header search path, for GCC searches headers in the
555555
# directory that contains the source file by default.
556556
origin_src_dirs= []

‎gyp/pylib/gyp/generator/cmake.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class CMakeNamer(object):
574574
"""Converts Gyp target names into CMake target names.
575575
576576
CMake requires that target names be globally unique. One way to ensure
577-
this is to fully qualify the names of the targets. Unfortunatly, this
577+
this is to fully qualify the names of the targets. Unfortunately, this
578578
ends up with all targets looking like "chrome_chrome_gyp_chrome" instead
579579
of just "chrome". If this generator were only interested in building, it
580580
would be possible to fully qualify all target names, then create

‎gyp/pylib/gyp/generator/eclipse.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params,
195195
"""Calculate the defines for a project.
196196
197197
Returns:
198-
A dict that includes explict defines declared in gyp files along with all of
198+
A dict that includes explicit defines declared in gyp files along with all of
199199
the default defines that the compiler uses.
200200
"""
201201

‎gyp/pylib/gyp/generator/make.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# all are sourced by the top-level Makefile. This means that all
1313
# variables in .mk-files clobber one another. Be careful to use :=
1414
# where appropriate for immediate evaluation, and similarly to watch
15-
# that you're not relying on a variable value to last beween different
15+
# that you're not relying on a variable value to last between different
1616
# .mk files.
1717
#
1818
# TODOs:

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3069,7 +3069,7 @@ def _FinalizeMSBuildSettings(spec, configuration):
30693069
_ToolAppend(msbuild_settings, 'ResourceCompile',
30703070
'AdditionalIncludeDirectories', resource_include_dirs)
30713071
# Add in libraries, note that even for empty libraries, we want this
3072-
# set, to prevent inheriting default libraries from the enviroment.
3072+
# set, to prevent inheriting default libraries from the environment.
30733073
_ToolSetOrAppend(msbuild_settings, 'Link', 'AdditionalDependencies',
30743074
libraries)
30753075
_ToolAppend(msbuild_settings, 'Link', 'AdditionalLibraryDirectories',

‎gyp/pylib/gyp/generator/ninja.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
18211821
# - The priority from low to high is gcc/g++, the 'make_global_settings' in
18221822
# gyp, the environment variable.
18231823
# - If there is no 'make_global_settings' for CC.host/CXX.host or
1824-
# 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
1824+
# 'CC_host'/'CXX_host' environment variable, cc_host/cxx_host should be set
18251825
# to cc/cxx.
18261826
ifflavor=='win':
18271827
ar='lib.exe'

‎gyp/pylib/gyp/generator/xcode.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
998998
actions.append(action)
999999

10001000
iflen(concrete_outputs_all) >0:
1001-
# TODO(mark): There's a possibilty for collision here. Consider
1001+
# TODO(mark): There's a possibility for collision here. Consider
10021002
# target "t" rule "A_r" and target "t_A" rule "r".
10031003
makefile_name='%s.make'%re.sub(
10041004
'[^a-zA-Z0-9_]', '_' , '%s_%s'% (target_name, rule['rule_name']))

‎gyp/pylib/gyp/input.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ def EvalSingleCondition(
10731073
cond_expr, true_dict, false_dict, phase, variables, build_file):
10741074
"""Returns true_dict if cond_expr evaluates to true, and false_dict
10751075
otherwise."""
1076-
# Do expansions on the condition itself. Since the conditon can naturally
1076+
# Do expansions on the condition itself. Since the condition can naturally
10771077
# contain variable references without needing to resort to GYP expansion
10781078
# syntax, this is of dubious value for variables, but someone might want to
10791079
# use a command expansion directly inside a condition.
@@ -1178,7 +1178,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
11781178
continue
11791179
ifthe_dict_key=='variables'andvariable_nameinthe_dict:
11801180
# If the variable is set without a % in the_dict, and the_dict is a
1181-
# variables dict (making |variables| a varaibles sub-dict of a
1181+
# variables dict (making |variables| a variables sub-dict of a
11821182
# variables dict), use the_dict's definition.
11831183
value=the_dict[variable_name]
11841184
else:
@@ -1864,7 +1864,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
18641864
continue
18651865
dependency_node=dependency_nodes.get(dependency_build_file)
18661866
ifnotdependency_node:
1867-
raiseGypError("Dependancy '%s' not found"%dependency_build_file)
1867+
raiseGypError("Dependency '%s' not found"%dependency_build_file)
18681868
ifdependency_nodenotinbuild_file_node.dependencies:
18691869
build_file_node.dependencies.append(dependency_node)
18701870
dependency_node.dependents.append(build_file_node)

‎gyp/pylib/gyp/msvs_emulation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def GetCompilerPdbName(self, config, expand_special):
375375
returnpdbname
376376

377377
defGetMapFileName(self, config, expand_special):
378-
"""Gets the explicitly overriden map file name for a target or returns None
378+
"""Gets the explicitly overridden map file name for a target or returns None
379379
if it's not set."""
380380
config=self._TargetConfig(config)
381381
map_file=self._Setting(('VCLinkerTool', 'MapFileName'), config)

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
778778
product_dir: The directory where products such static and dynamic
779779
libraries are placed. This is added to the library search path.
780780
gyp_to_build_path: A function that converts paths relative to the
781-
current gyp file to paths relative to the build direcotry.
781+
current gyp file to paths relative to the build directory.
782782
"""
783783
self.configname=configname
784784
ldflags= []
@@ -923,7 +923,7 @@ def GetPerTargetSetting(self, setting, default=None):
923923

924924
def_GetStripPostbuilds(self, configname, output_binary, quiet):
925925
"""Returns a list of shell commands that contain the shell commands
926-
neccessary to strip this target's binary. These should be run as postbuilds
926+
necessary to strip this target's binary. These should be run as postbuilds
927927
before the actual postbuilds run."""
928928
self.configname=configname
929929

@@ -957,7 +957,7 @@ def _GetStripPostbuilds(self, configname, output_binary, quiet):
957957

958958
def_GetDebugInfoPostbuilds(self, configname, output, output_binary, quiet):
959959
"""Returns a list of shell commands that contain the shell commands
960-
neccessary to massage this target's debug information. These should be run
960+
necessary to massage this target's debug information. These should be run
961961
as postbuilds before the actual postbuilds run."""
962962
self.configname=configname
963963

@@ -1052,7 +1052,7 @@ def _AdjustLibrary(self, library, config_name=None):
10521052
# "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
10531053
# library order and cause collision when building Chrome.
10541054
#
1055-
# Instead substitude ".tbd" to ".dylib" in the generated project when the
1055+
# Instead substitute ".tbd" to ".dylib" in the generated project when the
10561056
# following conditions are both true:
10571057
# - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
10581058
# - the ".dylib" file does not exists but a ".tbd" file do.
@@ -1341,7 +1341,7 @@ def GetStdout(cmdlist):
13411341
defMergeGlobalXcodeSettingsToSpec(global_dict, spec):
13421342
"""Merges the global xcode_settings dictionary into each configuration of the
13431343
target represented by spec. For keys that are both in the global and the local
1344-
xcode_settings dict, the local key gets precendence.
1344+
xcode_settings dict, the local key gets precedence.
13451345
"""
13461346
# The xcode generator special-cases global xcode_settings and does something
13471347
# that amounts to merging in the global xcode_settings into each local
@@ -1384,7 +1384,7 @@ def GetMacBundleResources(product_dir, xcode_settings, resources):
13841384
output=dest
13851385

13861386
# The make generator doesn't support it, so forbid it everywhere
1387-
# to keep the generators more interchangable.
1387+
# to keep the generators more interchangeable.
13881388
assert' 'notinres, (
13891389
"Spaces in resource filenames not supported (%s)"%res)
13901390

@@ -1426,14 +1426,14 @@ def GetMacInfoPlist(product_dir, xcode_settings, gyp_path_to_build_path):
14261426
relative to the build directory.
14271427
xcode_settings: The XcodeSettings of the current target.
14281428
gyp_to_build_path: A function that converts paths relative to the
1429-
current gyp file to paths relative to the build direcotry.
1429+
current gyp file to paths relative to the build directory.
14301430
"""
14311431
info_plist=xcode_settings.GetPerTargetSetting('INFOPLIST_FILE')
14321432
ifnotinfo_plist:
14331433
returnNone, None, [], {}
14341434

14351435
# The make generator doesn't support it, so forbid it everywhere
1436-
# to keep the generators more interchangable.
1436+
# to keep the generators more interchangeable.
14371437
assert' 'notininfo_plist, (
14381438
"Spaces in Info.plist filenames not supported (%s)"%info_plist)
14391439

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 06019ba

Browse files
XhmikosRrvagg
authored andcommitted
gyp: assorted typo fixes
PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3f4972c commit 06019ba

13 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎gyp/pylib/gyp/generator/android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ def WriteSources(self, spec, configs, extra_sources):
550550
# to work properly. If the file has the wrong C++ extension, then we add
551551
# a rule to copy that to intermediates and use the new version.
552552
final_generated_sources= []
553-
# If a source file gets copied, we still need to add the orginal source
553+
# If a source file gets copied, we still need to add the original source
554554
# directory as header search path, for GCC searches headers in the
555555
# directory that contains the source file by default.
556556
origin_src_dirs= []

‎gyp/pylib/gyp/generator/cmake.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class CMakeNamer(object):
574574
"""Converts Gyp target names into CMake target names.
575575
576576
CMake requires that target names be globally unique. One way to ensure
577-
this is to fully qualify the names of the targets. Unfortunatly, this
577+
this is to fully qualify the names of the targets. Unfortunately, this
578578
ends up with all targets looking like "chrome_chrome_gyp_chrome" instead
579579
of just "chrome". If this generator were only interested in building, it
580580
would be possible to fully qualify all target names, then create

‎gyp/pylib/gyp/generator/eclipse.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params,
195195
"""Calculate the defines for a project.
196196
197197
Returns:
198-
A dict that includes explict defines declared in gyp files along with all of
198+
A dict that includes explicit defines declared in gyp files along with all of
199199
the default defines that the compiler uses.
200200
"""
201201

‎gyp/pylib/gyp/generator/make.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# all are sourced by the top-level Makefile. This means that all
1313
# variables in .mk-files clobber one another. Be careful to use :=
1414
# where appropriate for immediate evaluation, and similarly to watch
15-
# that you're not relying on a variable value to last beween different
15+
# that you're not relying on a variable value to last between different
1616
# .mk files.
1717
#
1818
# TODOs:

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3069,7 +3069,7 @@ def _FinalizeMSBuildSettings(spec, configuration):
30693069
_ToolAppend(msbuild_settings, 'ResourceCompile',
30703070
'AdditionalIncludeDirectories', resource_include_dirs)
30713071
# Add in libraries, note that even for empty libraries, we want this
3072-
# set, to prevent inheriting default libraries from the enviroment.
3072+
# set, to prevent inheriting default libraries from the environment.
30733073
_ToolSetOrAppend(msbuild_settings, 'Link', 'AdditionalDependencies',
30743074
libraries)
30753075
_ToolAppend(msbuild_settings, 'Link', 'AdditionalLibraryDirectories',

‎gyp/pylib/gyp/generator/ninja.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
18211821
# - The priority from low to high is gcc/g++, the 'make_global_settings' in
18221822
# gyp, the environment variable.
18231823
# - If there is no 'make_global_settings' for CC.host/CXX.host or
1824-
# 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
1824+
# 'CC_host'/'CXX_host' environment variable, cc_host/cxx_host should be set
18251825
# to cc/cxx.
18261826
ifflavor=='win':
18271827
ar='lib.exe'

‎gyp/pylib/gyp/generator/xcode.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
998998
actions.append(action)
999999

10001000
iflen(concrete_outputs_all) >0:
1001-
# TODO(mark): There's a possibilty for collision here. Consider
1001+
# TODO(mark): There's a possibility for collision here. Consider
10021002
# target "t" rule "A_r" and target "t_A" rule "r".
10031003
makefile_name='%s.make'%re.sub(
10041004
'[^a-zA-Z0-9_]', '_' , '%s_%s'% (target_name, rule['rule_name']))

‎gyp/pylib/gyp/input.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ def EvalSingleCondition(
10731073
cond_expr, true_dict, false_dict, phase, variables, build_file):
10741074
"""Returns true_dict if cond_expr evaluates to true, and false_dict
10751075
otherwise."""
1076-
# Do expansions on the condition itself. Since the conditon can naturally
1076+
# Do expansions on the condition itself. Since the condition can naturally
10771077
# contain variable references without needing to resort to GYP expansion
10781078
# syntax, this is of dubious value for variables, but someone might want to
10791079
# use a command expansion directly inside a condition.
@@ -1178,7 +1178,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
11781178
continue
11791179
ifthe_dict_key=='variables'andvariable_nameinthe_dict:
11801180
# If the variable is set without a % in the_dict, and the_dict is a
1181-
# variables dict (making |variables| a varaibles sub-dict of a
1181+
# variables dict (making |variables| a variables sub-dict of a
11821182
# variables dict), use the_dict's definition.
11831183
value=the_dict[variable_name]
11841184
else:
@@ -1864,7 +1864,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
18641864
continue
18651865
dependency_node=dependency_nodes.get(dependency_build_file)
18661866
ifnotdependency_node:
1867-
raiseGypError("Dependancy '%s' not found"%dependency_build_file)
1867+
raiseGypError("Dependency '%s' not found"%dependency_build_file)
18681868
ifdependency_nodenotinbuild_file_node.dependencies:
18691869
build_file_node.dependencies.append(dependency_node)
18701870
dependency_node.dependents.append(build_file_node)

‎gyp/pylib/gyp/msvs_emulation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def GetCompilerPdbName(self, config, expand_special):
375375
returnpdbname
376376

377377
defGetMapFileName(self, config, expand_special):
378-
"""Gets the explicitly overriden map file name for a target or returns None
378+
"""Gets the explicitly overridden map file name for a target or returns None
379379
if it's not set."""
380380
config=self._TargetConfig(config)
381381
map_file=self._Setting(('VCLinkerTool', 'MapFileName'), config)

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
778778
product_dir: The directory where products such static and dynamic
779779
libraries are placed. This is added to the library search path.
780780
gyp_to_build_path: A function that converts paths relative to the
781-
current gyp file to paths relative to the build direcotry.
781+
current gyp file to paths relative to the build directory.
782782
"""
783783
self.configname=configname
784784
ldflags= []
@@ -923,7 +923,7 @@ def GetPerTargetSetting(self, setting, default=None):
923923

924924
def_GetStripPostbuilds(self, configname, output_binary, quiet):
925925
"""Returns a list of shell commands that contain the shell commands
926-
neccessary to strip this target's binary. These should be run as postbuilds
926+
necessary to strip this target's binary. These should be run as postbuilds
927927
before the actual postbuilds run."""
928928
self.configname=configname
929929

@@ -957,7 +957,7 @@ def _GetStripPostbuilds(self, configname, output_binary, quiet):
957957

958958
def_GetDebugInfoPostbuilds(self, configname, output, output_binary, quiet):
959959
"""Returns a list of shell commands that contain the shell commands
960-
neccessary to massage this target's debug information. These should be run
960+
necessary to massage this target's debug information. These should be run
961961
as postbuilds before the actual postbuilds run."""
962962
self.configname=configname
963963

@@ -1052,7 +1052,7 @@ def _AdjustLibrary(self, library, config_name=None):
10521052
# "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
10531053
# library order and cause collision when building Chrome.
10541054
#
1055-
# Instead substitude ".tbd" to ".dylib" in the generated project when the
1055+
# Instead substitute ".tbd" to ".dylib" in the generated project when the
10561056
# following conditions are both true:
10571057
# - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
10581058
# - the ".dylib" file does not exists but a ".tbd" file do.
@@ -1341,7 +1341,7 @@ def GetStdout(cmdlist):
13411341
defMergeGlobalXcodeSettingsToSpec(global_dict, spec):
13421342
"""Merges the global xcode_settings dictionary into each configuration of the
13431343
target represented by spec. For keys that are both in the global and the local
1344-
xcode_settings dict, the local key gets precendence.
1344+
xcode_settings dict, the local key gets precedence.
13451345
"""
13461346
# The xcode generator special-cases global xcode_settings and does something
13471347
# that amounts to merging in the global xcode_settings into each local
@@ -1384,7 +1384,7 @@ def GetMacBundleResources(product_dir, xcode_settings, resources):
13841384
output=dest
13851385

13861386
# The make generator doesn't support it, so forbid it everywhere
1387-
# to keep the generators more interchangable.
1387+
# to keep the generators more interchangeable.
13881388
assert' 'notinres, (
13891389
"Spaces in resource filenames not supported (%s)"%res)
13901390

@@ -1426,14 +1426,14 @@ def GetMacInfoPlist(product_dir, xcode_settings, gyp_path_to_build_path):
14261426
relative to the build directory.
14271427
xcode_settings: The XcodeSettings of the current target.
14281428
gyp_to_build_path: A function that converts paths relative to the
1429-
current gyp file to paths relative to the build direcotry.
1429+
current gyp file to paths relative to the build directory.
14301430
"""
14311431
info_plist=xcode_settings.GetPerTargetSetting('INFOPLIST_FILE')
14321432
ifnotinfo_plist:
14331433
returnNone, None, [], {}
14341434

14351435
# The make generator doesn't support it, so forbid it everywhere
1436-
# to keep the generators more interchangable.
1436+
# to keep the generators more interchangeable.
14371437
assert' 'notininfo_plist, (
14381438
"Spaces in Info.plist filenames not supported (%s)"%info_plist)
14391439

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 06019ba

Browse files
XhmikosRrvagg
authored andcommitted
gyp: assorted typo fixes
PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3f4972c commit 06019ba

13 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎gyp/pylib/gyp/generator/android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ def WriteSources(self, spec, configs, extra_sources):
550550
# to work properly. If the file has the wrong C++ extension, then we add
551551
# a rule to copy that to intermediates and use the new version.
552552
final_generated_sources= []
553-
# If a source file gets copied, we still need to add the orginal source
553+
# If a source file gets copied, we still need to add the original source
554554
# directory as header search path, for GCC searches headers in the
555555
# directory that contains the source file by default.
556556
origin_src_dirs= []

‎gyp/pylib/gyp/generator/cmake.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class CMakeNamer(object):
574574
"""Converts Gyp target names into CMake target names.
575575
576576
CMake requires that target names be globally unique. One way to ensure
577-
this is to fully qualify the names of the targets. Unfortunatly, this
577+
this is to fully qualify the names of the targets. Unfortunately, this
578578
ends up with all targets looking like "chrome_chrome_gyp_chrome" instead
579579
of just "chrome". If this generator were only interested in building, it
580580
would be possible to fully qualify all target names, then create

‎gyp/pylib/gyp/generator/eclipse.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params,
195195
"""Calculate the defines for a project.
196196
197197
Returns:
198-
A dict that includes explict defines declared in gyp files along with all of
198+
A dict that includes explicit defines declared in gyp files along with all of
199199
the default defines that the compiler uses.
200200
"""
201201

‎gyp/pylib/gyp/generator/make.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# all are sourced by the top-level Makefile. This means that all
1313
# variables in .mk-files clobber one another. Be careful to use :=
1414
# where appropriate for immediate evaluation, and similarly to watch
15-
# that you're not relying on a variable value to last beween different
15+
# that you're not relying on a variable value to last between different
1616
# .mk files.
1717
#
1818
# TODOs:

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3069,7 +3069,7 @@ def _FinalizeMSBuildSettings(spec, configuration):
30693069
_ToolAppend(msbuild_settings, 'ResourceCompile',
30703070
'AdditionalIncludeDirectories', resource_include_dirs)
30713071
# Add in libraries, note that even for empty libraries, we want this
3072-
# set, to prevent inheriting default libraries from the enviroment.
3072+
# set, to prevent inheriting default libraries from the environment.
30733073
_ToolSetOrAppend(msbuild_settings, 'Link', 'AdditionalDependencies',
30743074
libraries)
30753075
_ToolAppend(msbuild_settings, 'Link', 'AdditionalLibraryDirectories',

‎gyp/pylib/gyp/generator/ninja.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
18211821
# - The priority from low to high is gcc/g++, the 'make_global_settings' in
18221822
# gyp, the environment variable.
18231823
# - If there is no 'make_global_settings' for CC.host/CXX.host or
1824-
# 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
1824+
# 'CC_host'/'CXX_host' environment variable, cc_host/cxx_host should be set
18251825
# to cc/cxx.
18261826
ifflavor=='win':
18271827
ar='lib.exe'

‎gyp/pylib/gyp/generator/xcode.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
998998
actions.append(action)
999999

10001000
iflen(concrete_outputs_all) >0:
1001-
# TODO(mark): There's a possibilty for collision here. Consider
1001+
# TODO(mark): There's a possibility for collision here. Consider
10021002
# target "t" rule "A_r" and target "t_A" rule "r".
10031003
makefile_name='%s.make'%re.sub(
10041004
'[^a-zA-Z0-9_]', '_' , '%s_%s'% (target_name, rule['rule_name']))

‎gyp/pylib/gyp/input.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ def EvalSingleCondition(
10731073
cond_expr, true_dict, false_dict, phase, variables, build_file):
10741074
"""Returns true_dict if cond_expr evaluates to true, and false_dict
10751075
otherwise."""
1076-
# Do expansions on the condition itself. Since the conditon can naturally
1076+
# Do expansions on the condition itself. Since the condition can naturally
10771077
# contain variable references without needing to resort to GYP expansion
10781078
# syntax, this is of dubious value for variables, but someone might want to
10791079
# use a command expansion directly inside a condition.
@@ -1178,7 +1178,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
11781178
continue
11791179
ifthe_dict_key=='variables'andvariable_nameinthe_dict:
11801180
# If the variable is set without a % in the_dict, and the_dict is a
1181-
# variables dict (making |variables| a varaibles sub-dict of a
1181+
# variables dict (making |variables| a variables sub-dict of a
11821182
# variables dict), use the_dict's definition.
11831183
value=the_dict[variable_name]
11841184
else:
@@ -1864,7 +1864,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
18641864
continue
18651865
dependency_node=dependency_nodes.get(dependency_build_file)
18661866
ifnotdependency_node:
1867-
raiseGypError("Dependancy '%s' not found"%dependency_build_file)
1867+
raiseGypError("Dependency '%s' not found"%dependency_build_file)
18681868
ifdependency_nodenotinbuild_file_node.dependencies:
18691869
build_file_node.dependencies.append(dependency_node)
18701870
dependency_node.dependents.append(build_file_node)

‎gyp/pylib/gyp/msvs_emulation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def GetCompilerPdbName(self, config, expand_special):
375375
returnpdbname
376376

377377
defGetMapFileName(self, config, expand_special):
378-
"""Gets the explicitly overriden map file name for a target or returns None
378+
"""Gets the explicitly overridden map file name for a target or returns None
379379
if it's not set."""
380380
config=self._TargetConfig(config)
381381
map_file=self._Setting(('VCLinkerTool', 'MapFileName'), config)

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
778778
product_dir: The directory where products such static and dynamic
779779
libraries are placed. This is added to the library search path.
780780
gyp_to_build_path: A function that converts paths relative to the
781-
current gyp file to paths relative to the build direcotry.
781+
current gyp file to paths relative to the build directory.
782782
"""
783783
self.configname=configname
784784
ldflags= []
@@ -923,7 +923,7 @@ def GetPerTargetSetting(self, setting, default=None):
923923

924924
def_GetStripPostbuilds(self, configname, output_binary, quiet):
925925
"""Returns a list of shell commands that contain the shell commands
926-
neccessary to strip this target's binary. These should be run as postbuilds
926+
necessary to strip this target's binary. These should be run as postbuilds
927927
before the actual postbuilds run."""
928928
self.configname=configname
929929

@@ -957,7 +957,7 @@ def _GetStripPostbuilds(self, configname, output_binary, quiet):
957957

958958
def_GetDebugInfoPostbuilds(self, configname, output, output_binary, quiet):
959959
"""Returns a list of shell commands that contain the shell commands
960-
neccessary to massage this target's debug information. These should be run
960+
necessary to massage this target's debug information. These should be run
961961
as postbuilds before the actual postbuilds run."""
962962
self.configname=configname
963963

@@ -1052,7 +1052,7 @@ def _AdjustLibrary(self, library, config_name=None):
10521052
# "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
10531053
# library order and cause collision when building Chrome.
10541054
#
1055-
# Instead substitude ".tbd" to ".dylib" in the generated project when the
1055+
# Instead substitute ".tbd" to ".dylib" in the generated project when the
10561056
# following conditions are both true:
10571057
# - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
10581058
# - the ".dylib" file does not exists but a ".tbd" file do.
@@ -1341,7 +1341,7 @@ def GetStdout(cmdlist):
13411341
defMergeGlobalXcodeSettingsToSpec(global_dict, spec):
13421342
"""Merges the global xcode_settings dictionary into each configuration of the
13431343
target represented by spec. For keys that are both in the global and the local
1344-
xcode_settings dict, the local key gets precendence.
1344+
xcode_settings dict, the local key gets precedence.
13451345
"""
13461346
# The xcode generator special-cases global xcode_settings and does something
13471347
# that amounts to merging in the global xcode_settings into each local
@@ -1384,7 +1384,7 @@ def GetMacBundleResources(product_dir, xcode_settings, resources):
13841384
output=dest
13851385

13861386
# The make generator doesn't support it, so forbid it everywhere
1387-
# to keep the generators more interchangable.
1387+
# to keep the generators more interchangeable.
13881388
assert' 'notinres, (
13891389
"Spaces in resource filenames not supported (%s)"%res)
13901390

@@ -1426,14 +1426,14 @@ def GetMacInfoPlist(product_dir, xcode_settings, gyp_path_to_build_path):
14261426
relative to the build directory.
14271427
xcode_settings: The XcodeSettings of the current target.
14281428
gyp_to_build_path: A function that converts paths relative to the
1429-
current gyp file to paths relative to the build direcotry.
1429+
current gyp file to paths relative to the build directory.
14301430
"""
14311431
info_plist=xcode_settings.GetPerTargetSetting('INFOPLIST_FILE')
14321432
ifnotinfo_plist:
14331433
returnNone, None, [], {}
14341434

14351435
# The make generator doesn't support it, so forbid it everywhere
1436-
# to keep the generators more interchangable.
1436+
# to keep the generators more interchangeable.
14371437
assert' 'notininfo_plist, (
14381438
"Spaces in Info.plist filenames not supported (%s)"%info_plist)
14391439

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit 06019ba

Browse files
XhmikosRrvagg
authored andcommitted
gyp: assorted typo fixes
PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3f4972c commit 06019ba

13 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎gyp/pylib/gyp/generator/android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ def WriteSources(self, spec, configs, extra_sources):
550550
# to work properly. If the file has the wrong C++ extension, then we add
551551
# a rule to copy that to intermediates and use the new version.
552552
final_generated_sources= []
553-
# If a source file gets copied, we still need to add the orginal source
553+
# If a source file gets copied, we still need to add the original source
554554
# directory as header search path, for GCC searches headers in the
555555
# directory that contains the source file by default.
556556
origin_src_dirs= []

‎gyp/pylib/gyp/generator/cmake.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class CMakeNamer(object):
574574
"""Converts Gyp target names into CMake target names.
575575
576576
CMake requires that target names be globally unique. One way to ensure
577-
this is to fully qualify the names of the targets. Unfortunatly, this
577+
this is to fully qualify the names of the targets. Unfortunately, this
578578
ends up with all targets looking like "chrome_chrome_gyp_chrome" instead
579579
of just "chrome". If this generator were only interested in building, it
580580
would be possible to fully qualify all target names, then create

‎gyp/pylib/gyp/generator/eclipse.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params,
195195
"""Calculate the defines for a project.
196196
197197
Returns:
198-
A dict that includes explict defines declared in gyp files along with all of
198+
A dict that includes explicit defines declared in gyp files along with all of
199199
the default defines that the compiler uses.
200200
"""
201201

‎gyp/pylib/gyp/generator/make.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# all are sourced by the top-level Makefile. This means that all
1313
# variables in .mk-files clobber one another. Be careful to use :=
1414
# where appropriate for immediate evaluation, and similarly to watch
15-
# that you're not relying on a variable value to last beween different
15+
# that you're not relying on a variable value to last between different
1616
# .mk files.
1717
#
1818
# TODOs:

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3069,7 +3069,7 @@ def _FinalizeMSBuildSettings(spec, configuration):
30693069
_ToolAppend(msbuild_settings, 'ResourceCompile',
30703070
'AdditionalIncludeDirectories', resource_include_dirs)
30713071
# Add in libraries, note that even for empty libraries, we want this
3072-
# set, to prevent inheriting default libraries from the enviroment.
3072+
# set, to prevent inheriting default libraries from the environment.
30733073
_ToolSetOrAppend(msbuild_settings, 'Link', 'AdditionalDependencies',
30743074
libraries)
30753075
_ToolAppend(msbuild_settings, 'Link', 'AdditionalLibraryDirectories',

‎gyp/pylib/gyp/generator/ninja.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
18211821
# - The priority from low to high is gcc/g++, the 'make_global_settings' in
18221822
# gyp, the environment variable.
18231823
# - If there is no 'make_global_settings' for CC.host/CXX.host or
1824-
# 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
1824+
# 'CC_host'/'CXX_host' environment variable, cc_host/cxx_host should be set
18251825
# to cc/cxx.
18261826
ifflavor=='win':
18271827
ar='lib.exe'

‎gyp/pylib/gyp/generator/xcode.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
998998
actions.append(action)
999999

10001000
iflen(concrete_outputs_all) >0:
1001-
# TODO(mark): There's a possibilty for collision here. Consider
1001+
# TODO(mark): There's a possibility for collision here. Consider
10021002
# target "t" rule "A_r" and target "t_A" rule "r".
10031003
makefile_name='%s.make'%re.sub(
10041004
'[^a-zA-Z0-9_]', '_' , '%s_%s'% (target_name, rule['rule_name']))

‎gyp/pylib/gyp/input.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ def EvalSingleCondition(
10731073
cond_expr, true_dict, false_dict, phase, variables, build_file):
10741074
"""Returns true_dict if cond_expr evaluates to true, and false_dict
10751075
otherwise."""
1076-
# Do expansions on the condition itself. Since the conditon can naturally
1076+
# Do expansions on the condition itself. Since the condition can naturally
10771077
# contain variable references without needing to resort to GYP expansion
10781078
# syntax, this is of dubious value for variables, but someone might want to
10791079
# use a command expansion directly inside a condition.
@@ -1178,7 +1178,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
11781178
continue
11791179
ifthe_dict_key=='variables'andvariable_nameinthe_dict:
11801180
# If the variable is set without a % in the_dict, and the_dict is a
1181-
# variables dict (making |variables| a varaibles sub-dict of a
1181+
# variables dict (making |variables| a variables sub-dict of a
11821182
# variables dict), use the_dict's definition.
11831183
value=the_dict[variable_name]
11841184
else:
@@ -1864,7 +1864,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
18641864
continue
18651865
dependency_node=dependency_nodes.get(dependency_build_file)
18661866
ifnotdependency_node:
1867-
raiseGypError("Dependancy '%s' not found"%dependency_build_file)
1867+
raiseGypError("Dependency '%s' not found"%dependency_build_file)
18681868
ifdependency_nodenotinbuild_file_node.dependencies:
18691869
build_file_node.dependencies.append(dependency_node)
18701870
dependency_node.dependents.append(build_file_node)

‎gyp/pylib/gyp/msvs_emulation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def GetCompilerPdbName(self, config, expand_special):
375375
returnpdbname
376376

377377
defGetMapFileName(self, config, expand_special):
378-
"""Gets the explicitly overriden map file name for a target or returns None
378+
"""Gets the explicitly overridden map file name for a target or returns None
379379
if it's not set."""
380380
config=self._TargetConfig(config)
381381
map_file=self._Setting(('VCLinkerTool', 'MapFileName'), config)

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
778778
product_dir: The directory where products such static and dynamic
779779
libraries are placed. This is added to the library search path.
780780
gyp_to_build_path: A function that converts paths relative to the
781-
current gyp file to paths relative to the build direcotry.
781+
current gyp file to paths relative to the build directory.
782782
"""
783783
self.configname=configname
784784
ldflags= []
@@ -923,7 +923,7 @@ def GetPerTargetSetting(self, setting, default=None):
923923

924924
def_GetStripPostbuilds(self, configname, output_binary, quiet):
925925
"""Returns a list of shell commands that contain the shell commands
926-
neccessary to strip this target's binary. These should be run as postbuilds
926+
necessary to strip this target's binary. These should be run as postbuilds
927927
before the actual postbuilds run."""
928928
self.configname=configname
929929

@@ -957,7 +957,7 @@ def _GetStripPostbuilds(self, configname, output_binary, quiet):
957957

958958
def_GetDebugInfoPostbuilds(self, configname, output, output_binary, quiet):
959959
"""Returns a list of shell commands that contain the shell commands
960-
neccessary to massage this target's debug information. These should be run
960+
necessary to massage this target's debug information. These should be run
961961
as postbuilds before the actual postbuilds run."""
962962
self.configname=configname
963963

@@ -1052,7 +1052,7 @@ def _AdjustLibrary(self, library, config_name=None):
10521052
# "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
10531053
# library order and cause collision when building Chrome.
10541054
#
1055-
# Instead substitude ".tbd" to ".dylib" in the generated project when the
1055+
# Instead substitute ".tbd" to ".dylib" in the generated project when the
10561056
# following conditions are both true:
10571057
# - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
10581058
# - the ".dylib" file does not exists but a ".tbd" file do.
@@ -1341,7 +1341,7 @@ def GetStdout(cmdlist):
13411341
defMergeGlobalXcodeSettingsToSpec(global_dict, spec):
13421342
"""Merges the global xcode_settings dictionary into each configuration of the
13431343
target represented by spec. For keys that are both in the global and the local
1344-
xcode_settings dict, the local key gets precendence.
1344+
xcode_settings dict, the local key gets precedence.
13451345
"""
13461346
# The xcode generator special-cases global xcode_settings and does something
13471347
# that amounts to merging in the global xcode_settings into each local
@@ -1384,7 +1384,7 @@ def GetMacBundleResources(product_dir, xcode_settings, resources):
13841384
output=dest
13851385

13861386
# The make generator doesn't support it, so forbid it everywhere
1387-
# to keep the generators more interchangable.
1387+
# to keep the generators more interchangeable.
13881388
assert' 'notinres, (
13891389
"Spaces in resource filenames not supported (%s)"%res)
13901390

@@ -1426,14 +1426,14 @@ def GetMacInfoPlist(product_dir, xcode_settings, gyp_path_to_build_path):
14261426
relative to the build directory.
14271427
xcode_settings: The XcodeSettings of the current target.
14281428
gyp_to_build_path: A function that converts paths relative to the
1429-
current gyp file to paths relative to the build direcotry.
1429+
current gyp file to paths relative to the build directory.
14301430
"""
14311431
info_plist=xcode_settings.GetPerTargetSetting('INFOPLIST_FILE')
14321432
ifnotinfo_plist:
14331433
returnNone, None, [], {}
14341434

14351435
# The make generator doesn't support it, so forbid it everywhere
1436-
# to keep the generators more interchangable.
1436+
# to keep the generators more interchangeable.
14371437
assert' 'notininfo_plist, (
14381438
"Spaces in Info.plist filenames not supported (%s)"%info_plist)
14391439

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 06019ba

Browse files
XhmikosRrvagg
authored andcommitted
gyp: assorted typo fixes
PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3f4972c commit 06019ba

13 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎gyp/pylib/gyp/generator/android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ def WriteSources(self, spec, configs, extra_sources):
550550
# to work properly. If the file has the wrong C++ extension, then we add
551551
# a rule to copy that to intermediates and use the new version.
552552
final_generated_sources= []
553-
# If a source file gets copied, we still need to add the orginal source
553+
# If a source file gets copied, we still need to add the original source
554554
# directory as header search path, for GCC searches headers in the
555555
# directory that contains the source file by default.
556556
origin_src_dirs= []

‎gyp/pylib/gyp/generator/cmake.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class CMakeNamer(object):
574574
"""Converts Gyp target names into CMake target names.
575575
576576
CMake requires that target names be globally unique. One way to ensure
577-
this is to fully qualify the names of the targets. Unfortunatly, this
577+
this is to fully qualify the names of the targets. Unfortunately, this
578578
ends up with all targets looking like "chrome_chrome_gyp_chrome" instead
579579
of just "chrome". If this generator were only interested in building, it
580580
would be possible to fully qualify all target names, then create

‎gyp/pylib/gyp/generator/eclipse.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params,
195195
"""Calculate the defines for a project.
196196
197197
Returns:
198-
A dict that includes explict defines declared in gyp files along with all of
198+
A dict that includes explicit defines declared in gyp files along with all of
199199
the default defines that the compiler uses.
200200
"""
201201

‎gyp/pylib/gyp/generator/make.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# all are sourced by the top-level Makefile. This means that all
1313
# variables in .mk-files clobber one another. Be careful to use :=
1414
# where appropriate for immediate evaluation, and similarly to watch
15-
# that you're not relying on a variable value to last beween different
15+
# that you're not relying on a variable value to last between different
1616
# .mk files.
1717
#
1818
# TODOs:

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3069,7 +3069,7 @@ def _FinalizeMSBuildSettings(spec, configuration):
30693069
_ToolAppend(msbuild_settings, 'ResourceCompile',
30703070
'AdditionalIncludeDirectories', resource_include_dirs)
30713071
# Add in libraries, note that even for empty libraries, we want this
3072-
# set, to prevent inheriting default libraries from the enviroment.
3072+
# set, to prevent inheriting default libraries from the environment.
30733073
_ToolSetOrAppend(msbuild_settings, 'Link', 'AdditionalDependencies',
30743074
libraries)
30753075
_ToolAppend(msbuild_settings, 'Link', 'AdditionalLibraryDirectories',

‎gyp/pylib/gyp/generator/ninja.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
18211821
# - The priority from low to high is gcc/g++, the 'make_global_settings' in
18221822
# gyp, the environment variable.
18231823
# - If there is no 'make_global_settings' for CC.host/CXX.host or
1824-
# 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
1824+
# 'CC_host'/'CXX_host' environment variable, cc_host/cxx_host should be set
18251825
# to cc/cxx.
18261826
ifflavor=='win':
18271827
ar='lib.exe'

‎gyp/pylib/gyp/generator/xcode.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
998998
actions.append(action)
999999

10001000
iflen(concrete_outputs_all) >0:
1001-
# TODO(mark): There's a possibilty for collision here. Consider
1001+
# TODO(mark): There's a possibility for collision here. Consider
10021002
# target "t" rule "A_r" and target "t_A" rule "r".
10031003
makefile_name='%s.make'%re.sub(
10041004
'[^a-zA-Z0-9_]', '_' , '%s_%s'% (target_name, rule['rule_name']))

‎gyp/pylib/gyp/input.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ def EvalSingleCondition(
10731073
cond_expr, true_dict, false_dict, phase, variables, build_file):
10741074
"""Returns true_dict if cond_expr evaluates to true, and false_dict
10751075
otherwise."""
1076-
# Do expansions on the condition itself. Since the conditon can naturally
1076+
# Do expansions on the condition itself. Since the condition can naturally
10771077
# contain variable references without needing to resort to GYP expansion
10781078
# syntax, this is of dubious value for variables, but someone might want to
10791079
# use a command expansion directly inside a condition.
@@ -1178,7 +1178,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
11781178
continue
11791179
ifthe_dict_key=='variables'andvariable_nameinthe_dict:
11801180
# If the variable is set without a % in the_dict, and the_dict is a
1181-
# variables dict (making |variables| a varaibles sub-dict of a
1181+
# variables dict (making |variables| a variables sub-dict of a
11821182
# variables dict), use the_dict's definition.
11831183
value=the_dict[variable_name]
11841184
else:
@@ -1864,7 +1864,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
18641864
continue
18651865
dependency_node=dependency_nodes.get(dependency_build_file)
18661866
ifnotdependency_node:
1867-
raiseGypError("Dependancy '%s' not found"%dependency_build_file)
1867+
raiseGypError("Dependency '%s' not found"%dependency_build_file)
18681868
ifdependency_nodenotinbuild_file_node.dependencies:
18691869
build_file_node.dependencies.append(dependency_node)
18701870
dependency_node.dependents.append(build_file_node)

‎gyp/pylib/gyp/msvs_emulation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def GetCompilerPdbName(self, config, expand_special):
375375
returnpdbname
376376

377377
defGetMapFileName(self, config, expand_special):
378-
"""Gets the explicitly overriden map file name for a target or returns None
378+
"""Gets the explicitly overridden map file name for a target or returns None
379379
if it's not set."""
380380
config=self._TargetConfig(config)
381381
map_file=self._Setting(('VCLinkerTool', 'MapFileName'), config)

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
778778
product_dir: The directory where products such static and dynamic
779779
libraries are placed. This is added to the library search path.
780780
gyp_to_build_path: A function that converts paths relative to the
781-
current gyp file to paths relative to the build direcotry.
781+
current gyp file to paths relative to the build directory.
782782
"""
783783
self.configname=configname
784784
ldflags= []
@@ -923,7 +923,7 @@ def GetPerTargetSetting(self, setting, default=None):
923923

924924
def_GetStripPostbuilds(self, configname, output_binary, quiet):
925925
"""Returns a list of shell commands that contain the shell commands
926-
neccessary to strip this target's binary. These should be run as postbuilds
926+
necessary to strip this target's binary. These should be run as postbuilds
927927
before the actual postbuilds run."""
928928
self.configname=configname
929929

@@ -957,7 +957,7 @@ def _GetStripPostbuilds(self, configname, output_binary, quiet):
957957

958958
def_GetDebugInfoPostbuilds(self, configname, output, output_binary, quiet):
959959
"""Returns a list of shell commands that contain the shell commands
960-
neccessary to massage this target's debug information. These should be run
960+
necessary to massage this target's debug information. These should be run
961961
as postbuilds before the actual postbuilds run."""
962962
self.configname=configname
963963

@@ -1052,7 +1052,7 @@ def _AdjustLibrary(self, library, config_name=None):
10521052
# "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
10531053
# library order and cause collision when building Chrome.
10541054
#
1055-
# Instead substitude ".tbd" to ".dylib" in the generated project when the
1055+
# Instead substitute ".tbd" to ".dylib" in the generated project when the
10561056
# following conditions are both true:
10571057
# - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
10581058
# - the ".dylib" file does not exists but a ".tbd" file do.
@@ -1341,7 +1341,7 @@ def GetStdout(cmdlist):
13411341
defMergeGlobalXcodeSettingsToSpec(global_dict, spec):
13421342
"""Merges the global xcode_settings dictionary into each configuration of the
13431343
target represented by spec. For keys that are both in the global and the local
1344-
xcode_settings dict, the local key gets precendence.
1344+
xcode_settings dict, the local key gets precedence.
13451345
"""
13461346
# The xcode generator special-cases global xcode_settings and does something
13471347
# that amounts to merging in the global xcode_settings into each local
@@ -1384,7 +1384,7 @@ def GetMacBundleResources(product_dir, xcode_settings, resources):
13841384
output=dest
13851385

13861386
# The make generator doesn't support it, so forbid it everywhere
1387-
# to keep the generators more interchangable.
1387+
# to keep the generators more interchangeable.
13881388
assert' 'notinres, (
13891389
"Spaces in resource filenames not supported (%s)"%res)
13901390

@@ -1426,14 +1426,14 @@ def GetMacInfoPlist(product_dir, xcode_settings, gyp_path_to_build_path):
14261426
relative to the build directory.
14271427
xcode_settings: The XcodeSettings of the current target.
14281428
gyp_to_build_path: A function that converts paths relative to the
1429-
current gyp file to paths relative to the build direcotry.
1429+
current gyp file to paths relative to the build directory.
14301430
"""
14311431
info_plist=xcode_settings.GetPerTargetSetting('INFOPLIST_FILE')
14321432
ifnotinfo_plist:
14331433
returnNone, None, [], {}
14341434

14351435
# The make generator doesn't support it, so forbid it everywhere
1436-
# to keep the generators more interchangable.
1436+
# to keep the generators more interchangeable.
14371437
assert' 'notininfo_plist, (
14381438
"Spaces in Info.plist filenames not supported (%s)"%info_plist)
14391439

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 06019ba

Browse files
XhmikosRrvagg
authored andcommitted
gyp: assorted typo fixes
PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3f4972c commit 06019ba

13 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎gyp/pylib/gyp/generator/android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ def WriteSources(self, spec, configs, extra_sources):
550550
# to work properly. If the file has the wrong C++ extension, then we add
551551
# a rule to copy that to intermediates and use the new version.
552552
final_generated_sources= []
553-
# If a source file gets copied, we still need to add the orginal source
553+
# If a source file gets copied, we still need to add the original source
554554
# directory as header search path, for GCC searches headers in the
555555
# directory that contains the source file by default.
556556
origin_src_dirs= []

‎gyp/pylib/gyp/generator/cmake.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class CMakeNamer(object):
574574
"""Converts Gyp target names into CMake target names.
575575
576576
CMake requires that target names be globally unique. One way to ensure
577-
this is to fully qualify the names of the targets. Unfortunatly, this
577+
this is to fully qualify the names of the targets. Unfortunately, this
578578
ends up with all targets looking like "chrome_chrome_gyp_chrome" instead
579579
of just "chrome". If this generator were only interested in building, it
580580
would be possible to fully qualify all target names, then create

‎gyp/pylib/gyp/generator/eclipse.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params,
195195
"""Calculate the defines for a project.
196196
197197
Returns:
198-
A dict that includes explict defines declared in gyp files along with all of
198+
A dict that includes explicit defines declared in gyp files along with all of
199199
the default defines that the compiler uses.
200200
"""
201201

‎gyp/pylib/gyp/generator/make.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# all are sourced by the top-level Makefile. This means that all
1313
# variables in .mk-files clobber one another. Be careful to use :=
1414
# where appropriate for immediate evaluation, and similarly to watch
15-
# that you're not relying on a variable value to last beween different
15+
# that you're not relying on a variable value to last between different
1616
# .mk files.
1717
#
1818
# TODOs:

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3069,7 +3069,7 @@ def _FinalizeMSBuildSettings(spec, configuration):
30693069
_ToolAppend(msbuild_settings, 'ResourceCompile',
30703070
'AdditionalIncludeDirectories', resource_include_dirs)
30713071
# Add in libraries, note that even for empty libraries, we want this
3072-
# set, to prevent inheriting default libraries from the enviroment.
3072+
# set, to prevent inheriting default libraries from the environment.
30733073
_ToolSetOrAppend(msbuild_settings, 'Link', 'AdditionalDependencies',
30743074
libraries)
30753075
_ToolAppend(msbuild_settings, 'Link', 'AdditionalLibraryDirectories',

‎gyp/pylib/gyp/generator/ninja.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
18211821
# - The priority from low to high is gcc/g++, the 'make_global_settings' in
18221822
# gyp, the environment variable.
18231823
# - If there is no 'make_global_settings' for CC.host/CXX.host or
1824-
# 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
1824+
# 'CC_host'/'CXX_host' environment variable, cc_host/cxx_host should be set
18251825
# to cc/cxx.
18261826
ifflavor=='win':
18271827
ar='lib.exe'

‎gyp/pylib/gyp/generator/xcode.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
998998
actions.append(action)
999999

10001000
iflen(concrete_outputs_all) >0:
1001-
# TODO(mark): There's a possibilty for collision here. Consider
1001+
# TODO(mark): There's a possibility for collision here. Consider
10021002
# target "t" rule "A_r" and target "t_A" rule "r".
10031003
makefile_name='%s.make'%re.sub(
10041004
'[^a-zA-Z0-9_]', '_' , '%s_%s'% (target_name, rule['rule_name']))

‎gyp/pylib/gyp/input.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ def EvalSingleCondition(
10731073
cond_expr, true_dict, false_dict, phase, variables, build_file):
10741074
"""Returns true_dict if cond_expr evaluates to true, and false_dict
10751075
otherwise."""
1076-
# Do expansions on the condition itself. Since the conditon can naturally
1076+
# Do expansions on the condition itself. Since the condition can naturally
10771077
# contain variable references without needing to resort to GYP expansion
10781078
# syntax, this is of dubious value for variables, but someone might want to
10791079
# use a command expansion directly inside a condition.
@@ -1178,7 +1178,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
11781178
continue
11791179
ifthe_dict_key=='variables'andvariable_nameinthe_dict:
11801180
# If the variable is set without a % in the_dict, and the_dict is a
1181-
# variables dict (making |variables| a varaibles sub-dict of a
1181+
# variables dict (making |variables| a variables sub-dict of a
11821182
# variables dict), use the_dict's definition.
11831183
value=the_dict[variable_name]
11841184
else:
@@ -1864,7 +1864,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
18641864
continue
18651865
dependency_node=dependency_nodes.get(dependency_build_file)
18661866
ifnotdependency_node:
1867-
raiseGypError("Dependancy '%s' not found"%dependency_build_file)
1867+
raiseGypError("Dependency '%s' not found"%dependency_build_file)
18681868
ifdependency_nodenotinbuild_file_node.dependencies:
18691869
build_file_node.dependencies.append(dependency_node)
18701870
dependency_node.dependents.append(build_file_node)

‎gyp/pylib/gyp/msvs_emulation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def GetCompilerPdbName(self, config, expand_special):
375375
returnpdbname
376376

377377
defGetMapFileName(self, config, expand_special):
378-
"""Gets the explicitly overriden map file name for a target or returns None
378+
"""Gets the explicitly overridden map file name for a target or returns None
379379
if it's not set."""
380380
config=self._TargetConfig(config)
381381
map_file=self._Setting(('VCLinkerTool', 'MapFileName'), config)

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
778778
product_dir: The directory where products such static and dynamic
779779
libraries are placed. This is added to the library search path.
780780
gyp_to_build_path: A function that converts paths relative to the
781-
current gyp file to paths relative to the build direcotry.
781+
current gyp file to paths relative to the build directory.
782782
"""
783783
self.configname=configname
784784
ldflags= []
@@ -923,7 +923,7 @@ def GetPerTargetSetting(self, setting, default=None):
923923

924924
def_GetStripPostbuilds(self, configname, output_binary, quiet):
925925
"""Returns a list of shell commands that contain the shell commands
926-
neccessary to strip this target's binary. These should be run as postbuilds
926+
necessary to strip this target's binary. These should be run as postbuilds
927927
before the actual postbuilds run."""
928928
self.configname=configname
929929

@@ -957,7 +957,7 @@ def _GetStripPostbuilds(self, configname, output_binary, quiet):
957957

958958
def_GetDebugInfoPostbuilds(self, configname, output, output_binary, quiet):
959959
"""Returns a list of shell commands that contain the shell commands
960-
neccessary to massage this target's debug information. These should be run
960+
necessary to massage this target's debug information. These should be run
961961
as postbuilds before the actual postbuilds run."""
962962
self.configname=configname
963963

@@ -1052,7 +1052,7 @@ def _AdjustLibrary(self, library, config_name=None):
10521052
# "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
10531053
# library order and cause collision when building Chrome.
10541054
#
1055-
# Instead substitude ".tbd" to ".dylib" in the generated project when the
1055+
# Instead substitute ".tbd" to ".dylib" in the generated project when the
10561056
# following conditions are both true:
10571057
# - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
10581058
# - the ".dylib" file does not exists but a ".tbd" file do.
@@ -1341,7 +1341,7 @@ def GetStdout(cmdlist):
13411341
defMergeGlobalXcodeSettingsToSpec(global_dict, spec):
13421342
"""Merges the global xcode_settings dictionary into each configuration of the
13431343
target represented by spec. For keys that are both in the global and the local
1344-
xcode_settings dict, the local key gets precendence.
1344+
xcode_settings dict, the local key gets precedence.
13451345
"""
13461346
# The xcode generator special-cases global xcode_settings and does something
13471347
# that amounts to merging in the global xcode_settings into each local
@@ -1384,7 +1384,7 @@ def GetMacBundleResources(product_dir, xcode_settings, resources):
13841384
output=dest
13851385

13861386
# The make generator doesn't support it, so forbid it everywhere
1387-
# to keep the generators more interchangable.
1387+
# to keep the generators more interchangeable.
13881388
assert' 'notinres, (
13891389
"Spaces in resource filenames not supported (%s)"%res)
13901390

@@ -1426,14 +1426,14 @@ def GetMacInfoPlist(product_dir, xcode_settings, gyp_path_to_build_path):
14261426
relative to the build directory.
14271427
xcode_settings: The XcodeSettings of the current target.
14281428
gyp_to_build_path: A function that converts paths relative to the
1429-
current gyp file to paths relative to the build direcotry.
1429+
current gyp file to paths relative to the build directory.
14301430
"""
14311431
info_plist=xcode_settings.GetPerTargetSetting('INFOPLIST_FILE')
14321432
ifnotinfo_plist:
14331433
returnNone, None, [], {}
14341434

14351435
# The make generator doesn't support it, so forbid it everywhere
1436-
# to keep the generators more interchangable.
1436+
# to keep the generators more interchangeable.
14371437
assert' 'notininfo_plist, (
14381438
"Spaces in Info.plist filenames not supported (%s)"%info_plist)
14391439

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit 06019ba

Browse files
XhmikosRrvagg
authored andcommitted
gyp: assorted typo fixes
PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3f4972c commit 06019ba

13 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎gyp/pylib/gyp/generator/android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ def WriteSources(self, spec, configs, extra_sources):
550550
# to work properly. If the file has the wrong C++ extension, then we add
551551
# a rule to copy that to intermediates and use the new version.
552552
final_generated_sources= []
553-
# If a source file gets copied, we still need to add the orginal source
553+
# If a source file gets copied, we still need to add the original source
554554
# directory as header search path, for GCC searches headers in the
555555
# directory that contains the source file by default.
556556
origin_src_dirs= []

‎gyp/pylib/gyp/generator/cmake.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class CMakeNamer(object):
574574
"""Converts Gyp target names into CMake target names.
575575
576576
CMake requires that target names be globally unique. One way to ensure
577-
this is to fully qualify the names of the targets. Unfortunatly, this
577+
this is to fully qualify the names of the targets. Unfortunately, this
578578
ends up with all targets looking like "chrome_chrome_gyp_chrome" instead
579579
of just "chrome". If this generator were only interested in building, it
580580
would be possible to fully qualify all target names, then create

‎gyp/pylib/gyp/generator/eclipse.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params,
195195
"""Calculate the defines for a project.
196196
197197
Returns:
198-
A dict that includes explict defines declared in gyp files along with all of
198+
A dict that includes explicit defines declared in gyp files along with all of
199199
the default defines that the compiler uses.
200200
"""
201201

‎gyp/pylib/gyp/generator/make.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# all are sourced by the top-level Makefile. This means that all
1313
# variables in .mk-files clobber one another. Be careful to use :=
1414
# where appropriate for immediate evaluation, and similarly to watch
15-
# that you're not relying on a variable value to last beween different
15+
# that you're not relying on a variable value to last between different
1616
# .mk files.
1717
#
1818
# TODOs:

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3069,7 +3069,7 @@ def _FinalizeMSBuildSettings(spec, configuration):
30693069
_ToolAppend(msbuild_settings, 'ResourceCompile',
30703070
'AdditionalIncludeDirectories', resource_include_dirs)
30713071
# Add in libraries, note that even for empty libraries, we want this
3072-
# set, to prevent inheriting default libraries from the enviroment.
3072+
# set, to prevent inheriting default libraries from the environment.
30733073
_ToolSetOrAppend(msbuild_settings, 'Link', 'AdditionalDependencies',
30743074
libraries)
30753075
_ToolAppend(msbuild_settings, 'Link', 'AdditionalLibraryDirectories',

‎gyp/pylib/gyp/generator/ninja.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
18211821
# - The priority from low to high is gcc/g++, the 'make_global_settings' in
18221822
# gyp, the environment variable.
18231823
# - If there is no 'make_global_settings' for CC.host/CXX.host or
1824-
# 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
1824+
# 'CC_host'/'CXX_host' environment variable, cc_host/cxx_host should be set
18251825
# to cc/cxx.
18261826
ifflavor=='win':
18271827
ar='lib.exe'

‎gyp/pylib/gyp/generator/xcode.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
998998
actions.append(action)
999999

10001000
iflen(concrete_outputs_all) >0:
1001-
# TODO(mark): There's a possibilty for collision here. Consider
1001+
# TODO(mark): There's a possibility for collision here. Consider
10021002
# target "t" rule "A_r" and target "t_A" rule "r".
10031003
makefile_name='%s.make'%re.sub(
10041004
'[^a-zA-Z0-9_]', '_' , '%s_%s'% (target_name, rule['rule_name']))

‎gyp/pylib/gyp/input.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ def EvalSingleCondition(
10731073
cond_expr, true_dict, false_dict, phase, variables, build_file):
10741074
"""Returns true_dict if cond_expr evaluates to true, and false_dict
10751075
otherwise."""
1076-
# Do expansions on the condition itself. Since the conditon can naturally
1076+
# Do expansions on the condition itself. Since the condition can naturally
10771077
# contain variable references without needing to resort to GYP expansion
10781078
# syntax, this is of dubious value for variables, but someone might want to
10791079
# use a command expansion directly inside a condition.
@@ -1178,7 +1178,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
11781178
continue
11791179
ifthe_dict_key=='variables'andvariable_nameinthe_dict:
11801180
# If the variable is set without a % in the_dict, and the_dict is a
1181-
# variables dict (making |variables| a varaibles sub-dict of a
1181+
# variables dict (making |variables| a variables sub-dict of a
11821182
# variables dict), use the_dict's definition.
11831183
value=the_dict[variable_name]
11841184
else:
@@ -1864,7 +1864,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
18641864
continue
18651865
dependency_node=dependency_nodes.get(dependency_build_file)
18661866
ifnotdependency_node:
1867-
raiseGypError("Dependancy '%s' not found"%dependency_build_file)
1867+
raiseGypError("Dependency '%s' not found"%dependency_build_file)
18681868
ifdependency_nodenotinbuild_file_node.dependencies:
18691869
build_file_node.dependencies.append(dependency_node)
18701870
dependency_node.dependents.append(build_file_node)

‎gyp/pylib/gyp/msvs_emulation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def GetCompilerPdbName(self, config, expand_special):
375375
returnpdbname
376376

377377
defGetMapFileName(self, config, expand_special):
378-
"""Gets the explicitly overriden map file name for a target or returns None
378+
"""Gets the explicitly overridden map file name for a target or returns None
379379
if it's not set."""
380380
config=self._TargetConfig(config)
381381
map_file=self._Setting(('VCLinkerTool', 'MapFileName'), config)

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
778778
product_dir: The directory where products such static and dynamic
779779
libraries are placed. This is added to the library search path.
780780
gyp_to_build_path: A function that converts paths relative to the
781-
current gyp file to paths relative to the build direcotry.
781+
current gyp file to paths relative to the build directory.
782782
"""
783783
self.configname=configname
784784
ldflags= []
@@ -923,7 +923,7 @@ def GetPerTargetSetting(self, setting, default=None):
923923

924924
def_GetStripPostbuilds(self, configname, output_binary, quiet):
925925
"""Returns a list of shell commands that contain the shell commands
926-
neccessary to strip this target's binary. These should be run as postbuilds
926+
necessary to strip this target's binary. These should be run as postbuilds
927927
before the actual postbuilds run."""
928928
self.configname=configname
929929

@@ -957,7 +957,7 @@ def _GetStripPostbuilds(self, configname, output_binary, quiet):
957957

958958
def_GetDebugInfoPostbuilds(self, configname, output, output_binary, quiet):
959959
"""Returns a list of shell commands that contain the shell commands
960-
neccessary to massage this target's debug information. These should be run
960+
necessary to massage this target's debug information. These should be run
961961
as postbuilds before the actual postbuilds run."""
962962
self.configname=configname
963963

@@ -1052,7 +1052,7 @@ def _AdjustLibrary(self, library, config_name=None):
10521052
# "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
10531053
# library order and cause collision when building Chrome.
10541054
#
1055-
# Instead substitude ".tbd" to ".dylib" in the generated project when the
1055+
# Instead substitute ".tbd" to ".dylib" in the generated project when the
10561056
# following conditions are both true:
10571057
# - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
10581058
# - the ".dylib" file does not exists but a ".tbd" file do.
@@ -1341,7 +1341,7 @@ def GetStdout(cmdlist):
13411341
defMergeGlobalXcodeSettingsToSpec(global_dict, spec):
13421342
"""Merges the global xcode_settings dictionary into each configuration of the
13431343
target represented by spec. For keys that are both in the global and the local
1344-
xcode_settings dict, the local key gets precendence.
1344+
xcode_settings dict, the local key gets precedence.
13451345
"""
13461346
# The xcode generator special-cases global xcode_settings and does something
13471347
# that amounts to merging in the global xcode_settings into each local
@@ -1384,7 +1384,7 @@ def GetMacBundleResources(product_dir, xcode_settings, resources):
13841384
output=dest
13851385

13861386
# The make generator doesn't support it, so forbid it everywhere
1387-
# to keep the generators more interchangable.
1387+
# to keep the generators more interchangeable.
13881388
assert' 'notinres, (
13891389
"Spaces in resource filenames not supported (%s)"%res)
13901390

@@ -1426,14 +1426,14 @@ def GetMacInfoPlist(product_dir, xcode_settings, gyp_path_to_build_path):
14261426
relative to the build directory.
14271427
xcode_settings: The XcodeSettings of the current target.
14281428
gyp_to_build_path: A function that converts paths relative to the
1429-
current gyp file to paths relative to the build direcotry.
1429+
current gyp file to paths relative to the build directory.
14301430
"""
14311431
info_plist=xcode_settings.GetPerTargetSetting('INFOPLIST_FILE')
14321432
ifnotinfo_plist:
14331433
returnNone, None, [], {}
14341434

14351435
# The make generator doesn't support it, so forbid it everywhere
1436-
# to keep the generators more interchangable.
1436+
# to keep the generators more interchangeable.
14371437
assert' 'notininfo_plist, (
14381438
"Spaces in Info.plist filenames not supported (%s)"%info_plist)
14391439

0 commit comments

Comments
 (0)