Dart: Adds mojom pub package.

sky/tools/deploy_sdk.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.
 
 import argparse
 from datetime import datetime
 import logging
 import os
 import shutil
@@ skipping 156 matching lines @@
     copy_or_link(src_path('sky/engine/bindings/builtin.dart'),
         sdk_path('packages/sky/sdk_additions/dart_sky_builtins.dart'))
     bindings_path = os.path.join(build_dir, 'gen/sky/bindings')
     # dart_sky.dart has many supporting files:
     copy(bindings_path, sdk_path('packages/sky/sdk_additions'),
         dart_filter)
 
     # Mojo package, lots of overlap with gen, must be copied:
     copy(src_path('mojo/public'), sdk_path('packages/mojo/lib/public'),
         dart_filter)
-    mojom_dirs = [ os.path.join(build_dir, 'gen/dart-gen/mojom') ]
-    mojom_dirs += args.extra_mojom_dirs
-    for mojom_dir in mojom_dirs:
-      copy(mojom_dir, sdk_path('packages/mojom/lib/'), gen_filter)
+
+    # By convention the generated .mojom.dart files in a pub package
+    # go under $PACKAGE/lib/mojom.
+    # The mojo package owns all the .mojom.dart files that are not in the 'sky'
+    # mojom module.
+    def non_sky_gen_filter(path):
+        if os.path.isdir(path) and path.endswith('sky'):
+            return False
+        return gen_filter(path)
+    mojo_package_mojom_dir = sdk_path('packages/mojo/lib/mojom')
+    copy(os.path.join(build_dir, 'gen/dart-gen/mojom'), mojo_package_mojom_dir,
+         non_sky_gen_filter)
+
+    # The Sky package owns the .mojom.dart files in the 'sky' mojom module.
+    def sky_gen_filter(path):
+        if os.path.isfile(path) and not os.path.dirname(path).endswith('sky'):
+            return False
+        return gen_filter(path)
+    sky_package_mojom_dir = sdk_path('packages/sky/lib/mojom')
+    copy(os.path.join(build_dir, 'gen/dart-gen/mojom'), sky_package_mojom_dir,
+         sky_gen_filter)
 
     # Mojo SDK additions:
     copy_or_link(src_path('mojo/public/dart/bindings.dart'),
         sdk_path('packages/mojo/sdk_additions/dart_mojo_bindings.dart'))
     copy_or_link(src_path('mojo/public/dart/core.dart'),
         sdk_path('packages/mojo/sdk_additions/dart_mojo_core.dart'))
 
     if not skip_apks:
         ensure_dir_exists(sdk_path('packages/sky/apks'))
         shutil.copy(os.path.join(build_dir, 'apks', 'SkyDemo.apk'),
             sdk_path('packages/sky/apks'))
 
     if generate_licenses:
         with open(sdk_path('LICENSES.sky'), 'w') as license_file:
             subprocess.check_call([src_path('tools/licenses.py'), 'credits'],
                 stdout=license_file)
 
         copy_or_link(src_path('AUTHORS'), sdk_path('packages/mojo/AUTHORS'))
         copy_or_link(src_path('LICENSE'), sdk_path('packages/mojo/LICENSE'))
         copy_or_link(src_path('AUTHORS'), sdk_path('packages/sky/AUTHORS'))
         copy_or_link(src_path('LICENSE'), sdk_path('packages/sky/LICENSE'))
 
     if args.fake_pub_get_into:
         packages_dir = os.path.abspath(args.fake_pub_get_into)
         ensure_dir_exists(packages_dir)
         make_relative_symlink(sdk_path('packages/mojo/lib'),
             os.path.join(packages_dir, 'mojo'))
-        make_relative_symlink(sdk_path('packages/mojom/lib'),
-            os.path.join(packages_dir, 'mojom'))
         make_relative_symlink(sdk_path('packages/sky/lib'),
             os.path.join(packages_dir, 'sky'))
 
+        mojom_dirs = [ mojo_package_mojom_dir, sky_package_mojom_dir ]
+        mojom_dirs += args.extra_mojom_dirs
+        for mojom_dir in mojom_dirs:
+          copy(mojom_dir, os.path.join(packages_dir, 'mojom'), gen_filter)
+
     if should_commit:
         # Kinda a hack to make a prettier build dir for the commit:
         script_path = os.path.relpath(os.path.abspath(__file__), SRC_ROOT)
         rel_build_dir = os.path.relpath(build_dir, SRC_ROOT)
         revision = git_revision()
         commit_url = "https://github.com/domokit/mojo/commit/%s" % revision
         pattern = """Autogenerated from %s
 Using %s and build output from %s.
 """
         commit_message = pattern % (commit_url, script_path, rel_build_dir)
         subprocess.check_call(['git', 'add', '.'], cwd=sdk_root)
         subprocess.check_call([
             'git', 'commit',
             '-m', commit_message
             ], cwd=sdk_root)
 
     time_delta = datetime.now() - start_time
     print 'SDK built at %s in %ss' % (sdk_root, time_delta.total_seconds())
 
 
 if __name__ == '__main__':
     main()