Skip to content

Commit

Permalink
gyp: rm semicolons (Python != JavaScript)
Browse files Browse the repository at this point in the history
PR-URL: nodejs#1858
Reviewed-By: Christian Clauss <[email protected]>
Reviewed-By: Rod Vagg <[email protected]>
  • Loading branch information
MattIPv4 authored and rvagg committed Aug 20, 2019
1 parent cdb47bd commit 0a4d8c8
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions 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 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.values():
Expand Down
2 changes: 1 addition & 1 deletion gyp/pylib/gyp/generator/cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,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
12 changes: 6 additions & 6 deletions gyp/pylib/gyp/generator/make.py
Original file line number Diff line number Diff line change
Expand Up @@ -1225,16 +1225,16 @@ def WriteSources(self, configs, deps, sources,
cflags_c = config.get('cflags_c')
cflags_cc = config.get('cflags_cc')

self.WriteLn("# Flags passed to all source files.");
self.WriteLn("# Flags passed to all source files.")
self.WriteList(cflags, 'CFLAGS_%s' % configname)
self.WriteLn("# Flags passed to only C files.");
self.WriteLn("# Flags passed to only C files.")
self.WriteList(cflags_c, 'CFLAGS_C_%s' % configname)
self.WriteLn("# Flags passed to only C++ files.");
self.WriteLn("# Flags passed to only C++ files.")
self.WriteList(cflags_cc, 'CFLAGS_CC_%s' % configname)
if self.flavor == 'mac':
self.WriteLn("# Flags passed to only ObjC files.");
self.WriteLn("# Flags passed to only ObjC files.")
self.WriteList(cflags_objc, 'CFLAGS_OBJC_%s' % configname)
self.WriteLn("# Flags passed to only ObjC++ files.");
self.WriteLn("# Flags passed to only ObjC++ files.")
self.WriteList(cflags_objcc, 'CFLAGS_OBJCC_%s' % configname)
includes = config.get('include_dirs')
if includes:
Expand Down Expand Up @@ -1779,7 +1779,7 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
cmddigest = hashlib.sha1(command if command else self.target).hexdigest()
intermediate = "%s.intermediate" % cmddigest
self.WriteLn('%s: %s' % (' '.join(outputs), intermediate))
self.WriteLn('\t%s' % '@:');
self.WriteLn('\t%s' % '@:')
self.WriteLn('%s: %s' % ('.INTERMEDIATE', intermediate))
self.WriteLn('%s: %s%s' %
(intermediate, ' '.join(inputs), force_append))
Expand Down
8 changes: 4 additions & 4 deletions gyp/pylib/gyp/generator/xcode.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,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 @@ -637,7 +637,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 @@ -776,7 +776,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 @@ -1171,7 +1171,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

0 comments on commit 0a4d8c8

Please sign in to comment.