Skip to content

tools: this relates to #14336, fixes the 'make lint' portion with non-ascii build file path #16047

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.

Sign up for GitHub

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

Closed
sharkfisher wants to merge 4 commits into from
Closed

tools: this relates to #14336, fixes the 'make lint' portion with non-ascii build file path #16047

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1436e10
deps: this fixes #14336, non-ascii build file path when running make
sharkfisher Oct 6, 2017
511286e
tools: additional fixes for #14336 to pass ‘make lint’ when project p…
sharkfisher Oct 6, 2017
9a68c5a
Update cpplint.py
sharkfisher Oct 10, 2017
20f538e
Update CodeGenerator.py
sharkfisher Oct 10, 2017
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
4 changes: 2 additions & 2 deletions deps/v8/third_party/inspector_protocol/CodeGenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ def init_defaults(config_tuple, path, defaults):
jinja_dir = arg_options.jinja_dir
if not jinja_dir:
raise Exception("jinja directory must be specified")
output_base = arg_options.output_base
output_base = arg_options.output_base.decode('utf-8')
if not output_base:
raise Exception("Base output directory must be specified")
config_file = arg_options.config
if not config_file:
raise Exception("Config file name must be specified")
config_base = os.path.dirname(config_file)
config_base = os.path.dirname(config_file).decode('utf-8')
Copy link
Copy Markdown
Member

@BridgeAR BridgeAR Oct 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No changes should be made to the deps. Those changes should only happen upstream.

Copy link
Copy Markdown
Contributor

@mscdex mscdex Oct 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed.

Copy link
Copy Markdown
Member

@addaleax addaleax Oct 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes to this effect were already made upstream-upstream, btw: https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/574858 … ping @ak239

config_values = arg_options.config_value
if not config_values:
config_values = []
Expand Down
4 changes: 2 additions & 2 deletions tools/cpplint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ def RepositoryName(self):
fullname = self.FullName()
# XXX(bnoordhuis) Expects that cpplint.py lives in the tools/ directory.
toplevel = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..')).replace('\\', '/')
os.path.join(os.path.dirname(__file__), '..')).replace('\\', '/').decode('utf-8')
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Oct 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you wrap this at 80 columns?

prefix = os.path.commonprefix([fullname, toplevel])
return fullname[len(prefix) + 1:]

Expand Down Expand Up @@ -6084,7 +6084,7 @@ def main():

_cpplint_state.ResetErrorCounts()
for filename in filenames:
ProcessFile(filename, _cpplint_state.verbose_level)
ProcessFile(filename.decode('utf-8'), _cpplint_state.verbose_level)
_cpplint_state.PrintErrorCounts()

sys.exit(_cpplint_state.error_count > 0)
Expand Down
⚡