Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gyp: rm semicolons (Python != JavaScript) #29228

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/gyp/pylib/gyp/common_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ def test_platform_default(self):
self.assertFlavor('freebsd', 'freebsd9' , {})
self.assertFlavor('freebsd', 'freebsd10', {})
self.assertFlavor('openbsd', 'openbsd5' , {})
self.assertFlavor('solaris', 'sunos5' , {});
self.assertFlavor('solaris', 'sunos' , {});
self.assertFlavor('linux' , 'linux2' , {});
self.assertFlavor('linux' , 'linux3' , {});
self.assertFlavor('solaris', 'sunos5' , {})
self.assertFlavor('solaris', 'sunos' , {})
self.assertFlavor('linux' , 'linux2' , {})
self.assertFlavor('linux' , 'linux3' , {})

def test_param(self):
self.assertFlavor('foobar', 'linux2' , {'flavor': 'foobar'})
Expand Down
4 changes: 2 additions & 2 deletions tools/gyp/pylib/gyp/generator/analyzer.py
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ def _supplied_target_names(self):

def _supplied_target_names_no_all(self):
"""Returns the supplied test targets without 'all'."""
result = self._supplied_target_names();
result = self._supplied_target_names()
result.discard('all')
return result

Expand Down Expand Up @@ -668,7 +668,7 @@ def find_matching_test_target_names(self):

def find_matching_compile_target_names(self):
"""Returns the set of output compile targets."""
assert self.is_build_impacted();
assert self.is_build_impacted()
# Compile targets are found by searching up from changed targets.
# Reset the visited status for _GetBuildTargets.
for target in self._name_to_target.itervalues():
Expand Down
2 changes: 1 addition & 1 deletion tools/gyp/pylib/gyp/generator/cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
for src in srcs:
_, ext = os.path.splitext(src)
src_type = COMPILABLE_EXTENSIONS.get(ext, None)
src_norm_path = NormjoinPath(path_from_cmakelists_to_gyp, src);
src_norm_path = NormjoinPath(path_from_cmakelists_to_gyp, src)

if src_type == 's':
s_sources.append(src_norm_path)
Expand Down
8 changes: 4 additions & 4 deletions tools/gyp/pylib/gyp/generator/xcode.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def Finalize1(self, xcode_targets, serialize_all_tests):
targets_for_all.append(xcode_target)

if target_name.lower() == 'all':
has_custom_all = True;
has_custom_all = True

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

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

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

# Coalesce multiple "copies" sections in the same target with the same
# "destination" property into the same PBXCopyFilesBuildPhase, otherwise
Expand Down
4 changes: 2 additions & 2 deletions tools/gyp/pylib/gyp/mac_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ def ExecFilterLibtool(self, *cmd_list):
def ExecPackageIosFramework(self, framework):
# Find the name of the binary based on the part before the ".framework".
binary = os.path.basename(framework).split('.')[0]
module_path = os.path.join(framework, 'Modules');
module_path = os.path.join(framework, 'Modules')
if not os.path.exists(module_path):
os.mkdir(module_path)
module_template = 'framework module %s {\n' \
Expand Down Expand Up @@ -346,7 +346,7 @@ def ExecCompileIosFrameworkHeaderMap(self, out, framework, *all_headers):
WriteHmap(out, filelist)

def ExecCopyIosFrameworkHeaders(self, framework, *copy_headers):
header_path = os.path.join(framework, 'Headers');
header_path = os.path.join(framework, 'Headers')
if not os.path.exists(header_path):
os.makedirs(header_path)
for header in copy_headers:
Expand Down
4 changes: 2 additions & 2 deletions tools/gyp/pylib/gyp/xcode_emulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ def _GetIOSPostbuilds(self, configname, output_binary):
# Xcode expects XCTests to be copied into the TEST_HOST dir.
if self._IsXCTest():
source = os.path.join("${BUILT_PRODUCTS_DIR}", product_name)
test_host = os.path.dirname(settings.get('TEST_HOST'));
test_host = os.path.dirname(settings.get('TEST_HOST'))
xctest_destination = os.path.join(test_host, 'PlugIns', product_name)
postbuilds.extend(['ditto %s %s' % (source, xctest_destination)])

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

if self._IsXCTest():
# For device xctests, Xcode copies two extra frameworks into $TEST_HOST.
test_host = os.path.dirname(settings.get('TEST_HOST'));
test_host = os.path.dirname(settings.get('TEST_HOST'))
frameworks_dir = os.path.join(test_host, 'Frameworks')
platform_root = self._XcodePlatformPath(configname)
frameworks = \
Expand Down
4 changes: 2 additions & 2 deletions tools/gyp/pylib/gyp/xcodeproj_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -1994,7 +1994,7 @@ def SetDestination(self, path):

path_tree_match = self.path_tree_re.search(path)
if path_tree_match:
path_tree = path_tree_match.group(1);
path_tree = path_tree_match.group(1)
if path_tree in self.path_tree_first_to_subfolder:
subfolder = self.path_tree_first_to_subfolder[path_tree]
relative_path = path_tree_match.group(3)
Expand Down Expand Up @@ -2047,7 +2047,7 @@ def SetDestination(self, path):
# subfolder = 16 from above
# The second element of the path is an unrecognized variable.
# Include it and any remaining elements in relative_path.
relative_path = path_tree_match.group(3);
relative_path = path_tree_match.group(3)

else:
# The path starts with an unrecognized Xcode variable
Expand Down