Dart: Put generated .mojom.dart files under mojoms pacakge.

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 137 matching lines @@
     delete_all_non_hidden_files_in_directory(sdk_root, args.non_interactive)
 
     # Manually clear sdk_root above to avoid deleting dot-files.
     copy(src_path('sky/sdk'), sdk_root)
 
     copy_or_link(src_path('sky/examples'), sdk_path('examples'))
 
     # Sky package
     copy_or_link(src_path('sky/framework'), sdk_path('packages/sky/lib/framework'))
     copy_or_link(src_path('sky/assets'), sdk_path('packages/sky/lib/assets'))
-    # Copy gen files every time for now:
-    copy(os.path.join(build_dir, 'gen/sky'),
-        sdk_path('packages/sky/lib'), gen_filter)
 
     # Sky SDK additions:
     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)
-    copy(os.path.join(build_dir, 'gen/dart-gen/keyboard'),
-        sdk_path('packages/keyboard/lib'), gen_filter)
-    copy(os.path.join(build_dir, 'gen/dart-gen/mojo'),
-        sdk_path('packages/mojo/lib'), gen_filter)
+    copy(os.path.join(build_dir, 'gen/dart-gen/mojom'),
+        sdk_path('packages/mojom/lib/'), 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/keyboard/lib'),
-            os.path.join(packages_dir, 'keyboard'))
         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'))
 
     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()