Files generated by the JSON schema compiler are named incorrectly

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 20 matching lines @@
 def load_schema(schema):
   schema_filename, schema_extension = os.path.splitext(schema)
 
   if schema_extension == '.json':
     api_defs = json_schema.Load(schema)
   elif schema_extension == '.idl':
     api_defs = idl_schema.Load(schema)
   else:
     sys.exit("Did not recognize file extension %s for schema %s" %
              (schema_extension, schema))
+  if len(api_defs) != 1:
+    sys.exit("File %s has multiple schemas. Files are only allowed to contain a"
+             " single schema." % schema)
 
   return api_defs
 
 def handle_single_schema(filename, dest_dir, root, root_namespace):
   schema = os.path.normpath(filename)
   schema_filename, schema_extension = os.path.splitext(schema)
   api_defs = load_schema(schema)
 
   api_model = model.Model()
 
@@ skipping 10 matching lines @@
         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)
     if not namespace:
       continue
 
+    path, schema_filename = os.path.split(schema_filename)

[not at google - send to devlin, 2012/05/12 00:19:37]

Rather than doing this every loop, just do it at the top; and call it simplename
or shortname or something (rather than overriding schema_filename)

[cduvall, 2012/05/12 00:59:37]

Done.

+    if schema_filename != namespace.unix_name:
+      sys.exit("Filename %s%s is illegal. Name files using unix_hacker style." %
+               (schema_filename, schema_extension))
+
     # The output filename must match the input filename for gyp to deal with it
     # properly.
-    out_file = namespace.name
+    out_file = namespace.unix_name
     type_generator = cpp_type_generator.CppTypeGenerator(
         root_namespace, namespace, namespace.unix_name)
     for referenced_namespace in api_model.namespaces.values():
       if referenced_namespace == namespace:
         continue
       type_generator.AddNamespace(
           referenced_namespace,
-          referenced_namespace.name)
+          referenced_namespace.unix_name)
 
     h_code = (h_generator.HGenerator(namespace, type_generator)
         .Generate().Render())
     cc_code = (cc_generator.CCGenerator(namespace, type_generator)
         .Generate().Render())
 
     if dest_dir:
       with open(
           os.path.join(dest_dir, namespace.source_file_dir, out_file + '.cc'),
           'w') as cc_file:
@@ skipping 14 matching lines @@
 def handle_bundle_schema(filenames, dest_dir, root, root_namespace):
   # 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)
     api_defs.extend(load_schema(schema))
 
   api_model = model.Model()
   relpath = os.path.relpath(os.path.normpath(filenames[0]), root)
-  for target_namespace in api_defs:
-    api_model.AddNamespace(target_namespace, relpath)
+  for target_namespace, schema_filename in zip(api_defs, filenames):
+    namespace = api_model.AddNamespace(target_namespace, relpath)
+    filename, extension = os.path.splitext(schema_filename)
+    if namespace.unix_name != filename:

[not at google - send to devlin, 2012/05/12 00:19:37]

could you add a comment here explaining why (just the gyp stuff)?

[cduvall, 2012/05/12 00:59:37]

Done.

+      sys.exit("Filename %s is illegal. Name files using unix_hacker style." %
+               schema_filename)
 
   type_generator = cpp_type_generator.CppTypeGenerator(root_namespace)
   for referenced_namespace in api_model.namespaces.values():
     type_generator.AddNamespace(
         referenced_namespace,
-        referenced_namespace.name)
+        referenced_namespace.unix_name)
 
   generator = schema_bundle_generator.SchemaBundleGenerator(
       api_model, api_defs, type_generator)
   api_h_code = generator.GenerateAPIHeader().Render()
   schemas_h_code = generator.GenerateSchemasHeader().Render()
   schemas_cc_code = generator.GenerateSchemasCC().Render()
 
   if dest_dir:
     basedir = os.path.join(dest_dir, 'chrome/common/extensions/api')
     with open(os.path.join(basedir, 'generated_api.h'), 'w') as h_file:
@@ skipping 34 matching lines @@
 
   if not args:
     sys.exit(0) # This is OK as a no-op
   dest_dir = opts.destdir
   root_namespace = opts.namespace
 
   if opts.bundle:
     handle_bundle_schema(args, dest_dir, opts.root, root_namespace)
   else:
     handle_single_schema(args[0], dest_dir, opts.root, root_namespace)