diff options
| author | ricow@chromium.org <ricow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 12:19:33 +0000 |
|---|---|---|
| committer | ricow@chromium.org <ricow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 12:19:33 +0000 |
| commit | 758b0b7056fc7b518147fd0546b3f615d9b6851a (patch) | |
| tree | da66cd6c0403a3e23051d87cc5ab509c3d149b57 /tools/json_schema_compiler/compiler.py | |
| parent | f5ec20caaf9afe15af718dbf7e2116572000de24 (diff) | |
| download | chromium_src-758b0b7056fc7b518147fd0546b3f615d9b6851a.zip chromium_src-758b0b7056fc7b518147fd0546b3f615d9b6851a.tar.gz chromium_src-758b0b7056fc7b518147fd0546b3f615d9b6851a.tar.bz2 | |
Revert revision 176015
This is a manual revert, drover did not like the deleted files
> 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
TBR=isherman@chromium.org,battre@chromium.org,akalin@chromium.org
Review URL: https://codereview.chromium.org/11778097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176054 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, 3 insertions, 8 deletions
diff --git a/tools/json_schema_compiler/compiler.py b/tools/json_schema_compiler/compiler.py index a347541..ae92373 100755 --- a/tools/json_schema_compiler/compiler.py +++ b/tools/json_schema_compiler/compiler.py @@ -69,16 +69,13 @@ 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, - include_compiler_options=True) + namespace = api_model.AddNamespace(target_namespace, relpath) if not namespace: continue @@ -133,9 +130,7 @@ 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, - include_compiler_options=True) + namespace = api_model.AddNamespace(target_namespace, relpath) path, filename = os.path.split(schema_filename) short_filename, extension = os.path.splitext(filename) |