Add support for references in different paths in apis

tools/json_schema_compiler/compiler.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Generator for C++ structs from api json files.
 
 The purpose of this tool is to remove the need for hand-written code that
 converts to and from base::Value types when receiving javascript api calls.
 Originally written for generating code for extension apis. Reference schemas
 are in chrome/common/extensions/api.
 
 Usage example:
   compiler.py --root /home/Work/src --namespace extensions windows.json
     tabs.json
   compiler.py --destdir gen --root /home/Work/src
     --namespace extensions windows.json tabs.json
 """
 
 import optparse
 import os
 import sys
+import shlex

[not at google - send to devlin, 2014/08/25 22:22:47]

Alphabetic order.

[lfg, 2014/08/26 16:15:22]

Done.

 
 from cpp_bundle_generator import CppBundleGenerator
 from cpp_generator import CppGenerator
 from cpp_type_generator import CppTypeGenerator
 from dart_generator import DartGenerator
 import json_schema
 from model import Model
 from schema_loader import SchemaLoader
 
 # Names of supported code generators, as specified on the command-line.
 # First is default.
 GENERATORS = ['cpp', 'cpp-bundle', 'dart']
 
 def GenerateSchema(generator,
                    file_paths,
                    root,
                    destdir,
                    cpp_namespace_pattern,
                    dart_overrides_dir,
-                   impl_dir):
+                   impl_dir,
+                   includes):
   # Merge the source files into a single list of schemas.
   api_defs = []
   for file_path in file_paths:
     schema = os.path.normpath(file_path)
     schema_loader = SchemaLoader(
         os.path.dirname(os.path.relpath(schema, root)),
-        os.path.dirname(file_path))
+        os.path.dirname(file_path),
+        includes,
+        cpp_namespace_pattern)
     api_def = schema_loader.LoadSchema(os.path.split(schema)[1])
 
     # If compiling the C++ model code, delete 'nocompile' nodes.
     if generator == 'cpp':
       api_def = json_schema.DeleteNodes(api_def, 'nocompile')
     api_defs.extend(api_def)
 
   api_model = Model()
 
   # For single-schema compilation make sure that the first (i.e. only) schema
   # is the default one.
   default_namespace = None
 
   # If we have files from multiple source paths, we'll use the common parent
   # path as the source directory.
   src_path = None
 
   # Load the actual namespaces into the model.
   for target_namespace, file_path in zip(api_defs, file_paths):
     relpath = os.path.relpath(os.path.normpath(file_path), root)
     namespace = api_model.AddNamespace(target_namespace,
                                        relpath,
+                                       cpp_namespace_pattern,
                                        include_compiler_options=True)
 
     if default_namespace is None:
       default_namespace = namespace
 
     if src_path is None:
       src_path = namespace.source_file_dir
     else:
       src_path = os.path.commonprefix((src_path, namespace.source_file_dir))
 
@@ skipping 12 matching lines @@
                                               cpp_namespace_pattern,
                                               src_path,
                                               impl_dir)
     generators = [
       ('generated_api.cc', cpp_bundle_generator.api_cc_generator),
       ('generated_api.h', cpp_bundle_generator.api_h_generator),
       ('generated_schemas.cc', cpp_bundle_generator.schemas_cc_generator),
       ('generated_schemas.h', cpp_bundle_generator.schemas_h_generator)
     ]
   elif generator == 'cpp':
-    cpp_generator = CppGenerator(type_generator, cpp_namespace_pattern)
+    cpp_generator = CppGenerator(type_generator)
     generators = [
       ('%s.h' % filename_base, cpp_generator.h_generator),
       ('%s.cc' % filename_base, cpp_generator.cc_generator)
     ]
   elif generator == 'dart':
     generators = [
       ('%s.dart' % namespace.unix_name, DartGenerator(
           dart_overrides_dir))
     ]
   else:
@@ skipping 25 matching lines @@
   parser.add_option('-n', '--namespace', default='generated_api_schemas',
       help='C++ namespace for generated files. e.g extensions::api.')
   parser.add_option('-g', '--generator', default=GENERATORS[0],
       choices=GENERATORS,
       help='The generator to use to build the output code. Supported values are'
       ' %s' % GENERATORS)
   parser.add_option('-D', '--dart-overrides-dir', dest='dart_overrides_dir',
       help='Adds custom dart from files in the given directory (Dart only).')
   parser.add_option('-i', '--impl-dir', dest='impl_dir',
       help='The root path of all API implementations')
+  parser.add_option('-I', '--include', #dest='include',
+      help='A list of paths to include when searching for referenced objects')

[not at google - send to devlin, 2014/08/25 22:22:47]

Comment should also mention that convention of : separation

[lfg, 2014/08/26 16:15:22]

Done.

 
   (opts, file_paths) = parser.parse_args()
 
   if not file_paths:
     sys.exit(0) # This is OK as a no-op
 
   # Unless in bundle mode, only one file should be specified.
   if opts.generator != 'cpp-bundle' and len(file_paths) > 1:
     # TODO(sashab): Could also just use file_paths[0] here and not complain.
     raise Exception(
         "Unless in bundle mode, only one file can be specified at a time.")
 
+  includes = []
+  if opts.include:
+    include_split = shlex.split(opts.include)
+    for i in include_split:
+      path, namespace = i.split(':', 1)

[not at google - send to devlin, 2014/08/25 22:22:47]

This assumes that there is a ':' in the name. Maybe there should be, in which
case we should do some validation so that the error people see when they forget
to add a ':' isn't "ValueError: need more than 1 value to unpack". Suggestion
below:

[lfg, 2014/08/26 16:15:22]

Done.

+      includes.append( { 'path': path, 'namespace': namespace } )

[not at google - send to devlin, 2014/08/25 22:22:47]

How about:

def split_path_and_namespace(path_and_namespace):
  if ':' not in path_and_namespace:
    raise ValueError('Invalid include rule "%s". Rules must be of '
                     'the form path:namespace' % path_and_namespace)
  return path_and_namespace.split(':', 1)

includes [{'path': path, 'namespace': namespace},
          for path, namespace in split_path_and_namespace(rule)
          for rule in shlex.split(opts.include)]

[lfg, 2014/08/26 16:15:21]

Done.

+
   result = GenerateSchema(opts.generator, file_paths, opts.root, opts.destdir,
                           opts.namespace, opts.dart_overrides_dir,
-                          opts.impl_dir)
+                          opts.impl_dir, includes)
   if not opts.destdir:
     print result