Reland 596ff54335b2a1b393af10657bc4945114f3beed - Split API bundle generation steps

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.
@@ skipping 12 matching lines @@
 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']
+GENERATORS = ['cpp', 'cpp-bundle-registration', 'cpp-bundle-schema', 'dart']
 
-def GenerateSchema(generator,
+def GenerateSchema(generator_name,
                    file_paths,
                    root,
                    destdir,
                    cpp_namespace_pattern,
                    dart_overrides_dir,
                    impl_dir):
   # 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))
     api_def = schema_loader.LoadSchema(os.path.split(schema)[1])
 
     # If compiling the C++ model code, delete 'nocompile' nodes.
-    if generator == 'cpp':
+    if generator_name == '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
@@ skipping 15 matching lines @@
     else:
       src_path = os.path.commonprefix((src_path, namespace.source_file_dir))
 
     path, filename = os.path.split(file_path)
     filename_base, _ = os.path.splitext(filename)
 
   # Construct the type generator with all the namespaces in this model.
   type_generator = CppTypeGenerator(api_model,
                                     schema_loader,
                                     default_namespace)
-  if generator == 'cpp-bundle':
+  if generator_name in ('cpp-bundle-registration', 'cpp-bundle-schema'):
     cpp_bundle_generator = CppBundleGenerator(root,
                                               api_model,
                                               api_defs,
                                               type_generator,
                                               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':
+    if generator_name == 'cpp-bundle-registration':
+      generators = [
+        ('generated_api_registration.cc',
+         cpp_bundle_generator.api_cc_generator),
+        ('generated_api_registration.h', cpp_bundle_generator.api_h_generator),
+      ]
+    elif generator_name == 'cpp-bundle-schema':
+      generators = [
+        ('generated_schemas.cc', cpp_bundle_generator.schemas_cc_generator),
+        ('generated_schemas.h', cpp_bundle_generator.schemas_h_generator)
+      ]
+  elif generator_name == 'cpp':
     cpp_generator = CppGenerator(type_generator, cpp_namespace_pattern)
     generators = [
       ('%s.h' % filename_base, cpp_generator.h_generator),
       ('%s.cc' % filename_base, cpp_generator.cc_generator)
     ]
-  elif generator == 'dart':
+  elif generator_name == 'dart':
     generators = [
       ('%s.dart' % namespace.unix_name, DartGenerator(
           dart_overrides_dir))
     ]
   else:
     raise Exception('Unrecognised generator %s' % generator)
 
   output_code = []
   for filename, generator in generators:
     code = generator.Generate(namespace).Render()
     if destdir:
-      output_dir = os.path.join(destdir, src_path)
+      if generator_name == 'cpp-bundle-registration':
+        # Function registrations must be output to impl_dir, since they link in
+        # API implementations.
+        output_dir = os.path.join(destdir, impl_dir)
+      else:
+        output_dir = os.path.join(destdir, src_path)
       if not os.path.exists(output_dir):
         os.makedirs(output_dir)
       with open(os.path.join(output_dir, filename), 'w') as f:
         f.write(code)
     output_code += [filename, '', code, '']
 
   return '\n'.join(output_code)
 
 
 if __name__ == '__main__':
@@ skipping 15 matching lines @@
       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')
 
   (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:
+  if (opts.generator not in ('cpp-bundle-registration', 'cpp-bundle-schema') 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.")
 
   result = GenerateSchema(opts.generator, file_paths, opts.root, opts.destdir,
                           opts.namespace, opts.dart_overrides_dir,
                           opts.impl_dir)
   if not opts.destdir:
     print result