Generate Mojom Types for Dart

mojo/dart/tools/presubmit/check_mojom_dart.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """Checks that released mojom.dart files in the source tree are up to date"""
 
 import argparse
 import os
 import subprocess
@@ skipping 232 matching lines @@
 
 
 def is_mojom_dart(path):
   return path.endswith('.mojom.dart')
 
 
 def is_mojom(path):
   return path.endswith('.mojom')
 
 
+def is_generator_file(path):
+  return path.find('mojom_dart_generator.py') != -1 or \
+      (path.find('dart_templates') != -1 and path.endswith('.tmpl'))
+
+
 def filter_paths(paths, path_filter):
   result = []
   for path in paths:
     path = os.path.abspath(os.path.join(SRC_DIR, path))
     if path_filter(path):
       result.append(path)
   return result
 
 
 def safe_mtime(path):
@@ skipping 36 matching lines @@
       path = os.path.join(SRC_DIR, filename)
       mtime = safe_mtime(path)
       if mtime > latest_mtime:
         latest_mtime = mtime
   return latest_mtime
 
 
 def presubmit_check(packages, affected_files):
   mojoms = filter_paths(affected_files, is_mojom)
   mojom_darts = filter_paths(affected_files, is_mojom_dart)
+  generator_files = filter_paths(affected_files, is_generator_file)
 
   if check_for_bindings_machinery_changes(affected_files):

[zra, 2015/11/24 17:34:44]

Is the new code below still needed after this check?

[alexfandrianto, 2015/12/18 01:53:19]

Not using this anymore.

     # Bindings machinery changed, perform global check instead.
     latest_mtime = bindings_machinery_latest_mtime(affected_files)
     return global_check(packages, latest_mtime)
 
   updated_mojom_dart_files = []
   packages_with_failures = []
   check_failure = False
 
   # Check for updated .mojom without updated .mojom.dart
   for mojom_file in mojoms:
@@ skipping 23 matching lines @@
       print("Package %s has old %s" % (package, mojom_dart_path))
       if not (package in packages_with_failures):
         packages_with_failures.append(package)
       continue
     # Remember that this .mojom.dart file was updated after the .mojom file.
     # This list is used to verify that all updated .mojom.dart files were
     # updated because their source .mojom file changed.
     updated_mojom_dart_files.append(mojom_dart_path)
 
   # Check for updated .mojom.dart file without updated .mojom file.
-  for mojom_dart_file in mojom_darts:
-    # mojom_dart_file is not inside //mojo/dart/packages.
-    if not mojom_dart_file.startswith(PACKAGES_DIR):
-      continue
+  # If the Python generator or dart template files changed, skip this check.

[zra, 2015/11/24 17:34:44]

Is this case not already covered by the check_for_bindings_machinery_changes
check above?

[alexfandrianto, 2015/12/18 01:53:19]

Not using this anymore.

+  if len(generator_files) == 0:
+    for mojom_dart_file in mojom_darts:
+      # mojom_dart_file is not inside //mojo/dart/packages.
+      if not mojom_dart_file.startswith(PACKAGES_DIR):
+        continue
 
-    # Path relative to //mojo/dart/packages/
-    path_relative_to_packages = os.path.relpath(mojom_dart_file,
-                                                start=PACKAGES_DIR)
-    # Package name is first element of split path.
-    package = path_relative_to_packages.split(os.sep)[0]
-    # Path relative to src.
-    mojom_dart_path = os.path.relpath(mojom_dart_file, start=SRC_DIR)
-    # If mojom_dart_path is not in updated_mojom_dart_files, a .mojom.dart
-    # file was updated without updating the related .mojom file.
-    if not (mojom_dart_path in updated_mojom_dart_files):
-      check_failure = True
-      print("Package %s has new %s without updating source .mojom file." %
-            (package, mojom_dart_path))
-      if not (package in packages_with_failures):
-        packages_with_failures.append(package)
+      # Path relative to //mojo/dart/packages/
+      path_relative_to_packages = os.path.relpath(mojom_dart_file,
+                                                  start=PACKAGES_DIR)
+      # Package name is first element of split path.
+      package = path_relative_to_packages.split(os.sep)[0]
+      # Path relative to src.
+      mojom_dart_path = os.path.relpath(mojom_dart_file, start=SRC_DIR)
+      # If mojom_dart_path is not in updated_mojom_dart_files, a .mojom.dart
+      # file was updated without updating the related .mojom file.
+      if not (mojom_dart_path in updated_mojom_dart_files):
+        check_failure = True
+        print("Package %s has new %s without updating source .mojom file." %
+              (package, mojom_dart_path))
+        if not (package in packages_with_failures):
+          packages_with_failures.append(package)
 
   for package in packages_with_failures:
     _print_regenerate_message(package)
 
   return check_failure
 
 
 def main():
   parser = argparse.ArgumentParser(description='Generate a dart-pkg')
   parser.add_argument('--affected-files',
@@ skipping 17 matching lines @@
   if args.affected_files:
     check_failure = presubmit_check(packages, args.affected_files)
   else:
     check_failure = global_check(packages)
   if check_failure:
     return 2
   return 0
 
 if __name__ == '__main__':
     sys.exit(main())