Generate Mojom Types in Dart (Take 2)

mojo/dart/embedder/tools/dart_list_generated_bindings.py

Index: mojo/dart/embedder/tools/dart_list_generated_bindings.py
diff --git a/mojo/dart/embedder/tools/dart_list_generated_bindings.py b/mojo/dart/embedder/tools/dart_list_generated_bindings.py
index a630ad15ec3ddd5d1c9e7774877a6c823f5ac841..d7259a76b6a3589621d0d2c6e4769ec034fd405b 100755
--- a/mojo/dart/embedder/tools/dart_list_generated_bindings.py
+++ b/mojo/dart/embedder/tools/dart_list_generated_bindings.py
@@ -21,9 +21,14 @@ def main(args):
                       metavar='relative_directory_root',
                       help='Path to directory which all outputted paths will'
                            'be relative to.')
+  parser.add_argument('is_bindings_types',
+                      metavar='is_bindings_types',
+                      help='Whether or not the source directory is generating'
+                           'for mojo.bindings.types or not.')
   args = parser.parse_args()
   # Directory to start searching for .mojom files.
   source_directory = args.source_directory
+
   # Prefix to chop off output.
   root_prefix = os.path.abspath(args.relative_directory_root)
   for dirname, _, filenames in os.walk(source_directory):
@@ -33,6 +38,19 @@ def main(args):
       # Ignore tests.
       if dirname.endswith('tests'):
         continue;
+
+      # A hacky solution that splits the interface_control_messages.mojom file

[zra, 2016/01/15 21:01:34]

What would be a non-hacky solution?

It sounds like the module annotation in interface_control_messages.mojom might
be wrong. Maybe that should be fixed first in a separate CL.

[alexfandrianto, 2016/01/20 00:08:29]

The weird thing about the files in //mojo/public/interfaces/bindings is that:
* interface_control_messages.mojom has the module mojo
* mojom_files, mojom_types, and service_describer have the module
mojo.bindings.types;

I may be the first to run into a "weird" folder of mojoms like this, so this
hasn't been exercised until now.

I think a better solution would read the file and parse the module line to
determine where the generated files ought to go. As-is, all generated files go
to the same folder for the same build rule, but the .mojom.dart don't always
agree with that because of the module value.

+      # away from the other *.mojom files in the bindings directory. These
+      # other mojom files have a different module, so they belong in a different
+      # location.
+      if dirname.endswith('bindings'):
+        if args.is_bindings_types:
+          if f.endswith('interface_control_messages.mojom'):
+            continue
+        else:
+          if not f.endswith('interface_control_messages.mojom'):
+            continue
+
       path = os.path.abspath(os.path.join(dirname, f))
       path = os.path.relpath(path, root_prefix)
       # Append .dart.
@@ -41,4 +59,3 @@ def main(args):
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))
-