diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 04:05:55 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 04:05:55 +0000 |
| commit | 3044046b89190e30dedbfe43b8b021ed44a85e5d (patch) | |
| tree | 60cbaede9751a3d3e4532e15bdd6268dbac4dd48 /tools/json_schema_compiler/compiler.py | |
| parent | b40ffe723a35565425c58c581144d7b697593c03 (diff) | |
| download | chromium_src-3044046b89190e30dedbfe43b8b021ed44a85e5d.zip chromium_src-3044046b89190e30dedbfe43b8b021ed44a85e5d.tar.gz chromium_src-3044046b89190e30dedbfe43b8b021ed44a85e5d.tar.bz2 | |
Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it
was only run on IDL files. Clean up all the code which that simplifies.
TBR=isherman@chromium.org,battre@chromium.org,akalin@chromium.org
BUG=141318
Review URL: https://chromiumcodereview.appspot.com/11747025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/json_schema_compiler/compiler.py')
| -rwxr-xr-x | tools/json_schema_compiler/compiler.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/json_schema_compiler/compiler.py b/tools/json_schema_compiler/compiler.py index ae92373..a347541 100755 --- a/tools/json_schema_compiler/compiler.py +++ b/tools/json_schema_compiler/compiler.py @@ -69,13 +69,16 @@ def handle_single_schema(filename, dest_dir, root, root_namespace): referenced_api_defs = json_schema.Load(referenced_schema_path) for namespace in referenced_api_defs: - api_model.AddNamespace(namespace, + api_model.AddNamespace( + namespace, os.path.relpath(referenced_schema_path, opts.root)) # Gets the relative path from opts.root to the schema to correctly determine # the include path. relpath = os.path.relpath(schema, opts.root) - namespace = api_model.AddNamespace(target_namespace, relpath) + namespace = api_model.AddNamespace(target_namespace, + relpath, + include_compiler_options=True) if not namespace: continue @@ -130,7 +133,9 @@ def handle_bundle_schema(filenames, dest_dir, root, root_namespace): relpath = os.path.relpath(os.path.normpath(filenames[0]), root) for target_namespace, schema_filename in zip(api_defs, filenames): - namespace = api_model.AddNamespace(target_namespace, relpath) + namespace = api_model.AddNamespace(target_namespace, + relpath, + include_compiler_options=True) path, filename = os.path.split(schema_filename) short_filename, extension = os.path.splitext(filename) |