Skip to content

Commit 12cbb3f

Browse files
MattIPv4BridgeAR
authored andcommitted
gyp: remove semicolons (Python != JavaScript)
PR-URL: #29228 Reviewed-By: Christian Clauss <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Rod Vagg <[email protected]> Reviewed-By: Jiawen Geng <[email protected]>
1 parent feafc01 commit 12cbb3f

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

tools/gyp/pylib/gyp/common_test.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ def test_platform_default(self):
5959
self.assertFlavor('freebsd', 'freebsd9' , {})
6060
self.assertFlavor('freebsd', 'freebsd10', {})
6161
self.assertFlavor('openbsd', 'openbsd5' , {})
62-
self.assertFlavor('solaris', 'sunos5' , {});
63-
self.assertFlavor('solaris', 'sunos' , {});
64-
self.assertFlavor('linux' , 'linux2' , {});
65-
self.assertFlavor('linux' , 'linux3' , {});
62+
self.assertFlavor('solaris', 'sunos5' , {})
63+
self.assertFlavor('solaris', 'sunos' , {})
64+
self.assertFlavor('linux' , 'linux2' , {})
65+
self.assertFlavor('linux' , 'linux3' , {})
6666

6767
def test_param(self):
6868
self.assertFlavor('foobar', 'linux2' , {'flavor': 'foobar'})

tools/gyp/pylib/gyp/generator/analyzer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ def _supplied_target_names(self):
615615

616616
def _supplied_target_names_no_all(self):
617617
"""Returns the supplied test targets without 'all'."""
618-
result = self._supplied_target_names();
618+
result = self._supplied_target_names()
619619
result.discard('all')
620620
return result
621621

@@ -668,7 +668,7 @@ def find_matching_test_target_names(self):
668668

669669
def find_matching_compile_target_names(self):
670670
"""Returns the set of output compile targets."""
671-
assert self.is_build_impacted();
671+
assert self.is_build_impacted()
672672
# Compile targets are found by searching up from changed targets.
673673
# Reset the visited status for _GetBuildTargets.
674674
for target in self._name_to_target.itervalues():

tools/gyp/pylib/gyp/generator/cmake.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
686686
for src in srcs:
687687
_, ext = os.path.splitext(src)
688688
src_type = COMPILABLE_EXTENSIONS.get(ext, None)
689-
src_norm_path = NormjoinPath(path_from_cmakelists_to_gyp, src);
689+
src_norm_path = NormjoinPath(path_from_cmakelists_to_gyp, src)
690690

691691
if src_type == 's':
692692
s_sources.append(src_norm_path)

tools/gyp/pylib/gyp/generator/xcode.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def Finalize1(self, xcode_targets, serialize_all_tests):
248248
targets_for_all.append(xcode_target)
249249

250250
if target_name.lower() == 'all':
251-
has_custom_all = True;
251+
has_custom_all = True
252252

253253
# If this target has a 'run_as' attribute, add its target to the
254254
# targets, and add it to the test targets.
@@ -639,7 +639,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
639639
pbxp = xcp.project
640640

641641
# Set project-level attributes from multiple options
642-
project_attributes = {};
642+
project_attributes = {}
643643
if parallel_builds:
644644
project_attributes['BuildIndependentTargetsInParallel'] = 'YES'
645645
if upgrade_check_project_version:
@@ -788,7 +788,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
788788
# logic all happens in ninja. Don't bother creating the extra targets in
789789
# that case.
790790
if type != 'none' and (spec_actions or spec_rules) and not ninja_wrapper:
791-
support_xccl = CreateXCConfigurationList(configuration_names);
791+
support_xccl = CreateXCConfigurationList(configuration_names)
792792
support_target_suffix = generator_flags.get(
793793
'support_target_suffix', ' Support')
794794
support_target_properties = {
@@ -1183,7 +1183,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
11831183
dest = '$(SRCROOT)/' + dest
11841184

11851185
code_sign = int(copy_group.get('xcode_code_sign', 0))
1186-
settings = (None, '{ATTRIBUTES = (CodeSignOnCopy, ); }')[code_sign];
1186+
settings = (None, '{ATTRIBUTES = (CodeSignOnCopy, ); }')[code_sign]
11871187

11881188
# Coalesce multiple "copies" sections in the same target with the same
11891189
# "destination" property into the same PBXCopyFilesBuildPhase, otherwise

tools/gyp/pylib/gyp/mac_tool.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ def ExecFilterLibtool(self, *cmd_list):
285285
def ExecPackageIosFramework(self, framework):
286286
# Find the name of the binary based on the part before the ".framework".
287287
binary = os.path.basename(framework).split('.')[0]
288-
module_path = os.path.join(framework, 'Modules');
288+
module_path = os.path.join(framework, 'Modules')
289289
if not os.path.exists(module_path):
290290
os.mkdir(module_path)
291291
module_template = 'framework module %s {\n' \
@@ -346,7 +346,7 @@ def ExecCompileIosFrameworkHeaderMap(self, out, framework, *all_headers):
346346
WriteHmap(out, filelist)
347347

348348
def ExecCopyIosFrameworkHeaders(self, framework, *copy_headers):
349-
header_path = os.path.join(framework, 'Headers');
349+
header_path = os.path.join(framework, 'Headers')
350350
if not os.path.exists(header_path):
351351
os.makedirs(header_path)
352352
for header in copy_headers:

tools/gyp/pylib/gyp/xcode_emulation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ def _GetIOSPostbuilds(self, configname, output_binary):
10761076
# Xcode expects XCTests to be copied into the TEST_HOST dir.
10771077
if self._IsXCTest():
10781078
source = os.path.join("${BUILT_PRODUCTS_DIR}", product_name)
1079-
test_host = os.path.dirname(settings.get('TEST_HOST'));
1079+
test_host = os.path.dirname(settings.get('TEST_HOST'))
10801080
xctest_destination = os.path.join(test_host, 'PlugIns', product_name)
10811081
postbuilds.extend(['ditto %s %s' % (source, xctest_destination)])
10821082

@@ -1093,7 +1093,7 @@ def _GetIOSPostbuilds(self, configname, output_binary):
10931093

10941094
if self._IsXCTest():
10951095
# For device xctests, Xcode copies two extra frameworks into $TEST_HOST.
1096-
test_host = os.path.dirname(settings.get('TEST_HOST'));
1096+
test_host = os.path.dirname(settings.get('TEST_HOST'))
10971097
frameworks_dir = os.path.join(test_host, 'Frameworks')
10981098
platform_root = self._XcodePlatformPath(configname)
10991099
frameworks = \

tools/gyp/pylib/gyp/xcodeproj_file.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,7 +1994,7 @@ def SetDestination(self, path):
19941994

19951995
path_tree_match = self.path_tree_re.search(path)
19961996
if path_tree_match:
1997-
path_tree = path_tree_match.group(1);
1997+
path_tree = path_tree_match.group(1)
19981998
if path_tree in self.path_tree_first_to_subfolder:
19991999
subfolder = self.path_tree_first_to_subfolder[path_tree]
20002000
relative_path = path_tree_match.group(3)
@@ -2047,7 +2047,7 @@ def SetDestination(self, path):
20472047
# subfolder = 16 from above
20482048
# The second element of the path is an unrecognized variable.
20492049
# Include it and any remaining elements in relative_path.
2050-
relative_path = path_tree_match.group(3);
2050+
relative_path = path_tree_match.group(3)
20512051

20522052
else:
20532053
# The path starts with an unrecognized Xcode variable

0 commit comments

Comments
 (0)