tools/json_schema_compiler/compiler.py - Issue 23534063: Make SchemaLoader independent of current working directory.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/json_schema_compiler/compiler.py

Issue 23534063: Make SchemaLoader independent of current working directory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Code review fixes Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: tools/json_schema_compiler/compiler.py

diff --git a/tools/json_schema_compiler/compiler.py b/tools/json_schema_compiler/compiler.py

index ddab77eadd76a278dccd3778ec32009ee79dea32..edd183d4f57e73133b52ea467ed66b9b029bfccf 100755

--- a/tools/json_schema_compiler/compiler.py

+++ b/tools/json_schema_compiler/compiler.py

@@ -38,15 +38,14 @@ def GenerateSchema(generator,

destdir,

root_namespace,

dart_overrides_dir):

- schema_loader = SchemaLoader(os.path.dirname(os.path.relpath(

- os.path.normpath(filenames[0]), root)))

+ schema_loader = SchemaLoader(

+ os.path.dirname(os.path.relpath(os.path.normpath(filenames[0]), root)),

+ os.path.dirname(filenames[0]))

# Merge the source files into a single list of schemas.

api_defs = []

for filename in filenames:

schema = os.path.normpath(filename)

- schema_filename, schema_extension = os.path.splitext(schema)

- path, short_filename = os.path.split(schema_filename)

- api_def = schema_loader.LoadSchema(schema)

+ api_def = schema_loader.LoadSchema(os.path.split(schema)[1])

# If compiling the C++ model code, delete 'nocompile' nodes.

if generator == 'cpp':

« no previous file with comments | « no previous file | tools/json_schema_compiler/schema_loader.py » ('j') | no next file with comments »