diff --git a/sdk/packages/mojo/pubspec.yaml b/sdk/packages/mojo/pubspec.yaml new file mode 100644 index 00000000000..53c7c73129d --- /dev/null +++ b/sdk/packages/mojo/pubspec.yaml @@ -0,0 +1,5 @@ +author: Chromium Authors +description: Dart files to support executing inside Mojo. +name: mojo +homepage: https://github.com/domokit/mojo +version: 0.0.1 diff --git a/sdk/packages/sky/pubspec.yaml b/sdk/packages/sky/pubspec.yaml new file mode 100644 index 00000000000..548456a70f9 --- /dev/null +++ b/sdk/packages/sky/pubspec.yaml @@ -0,0 +1,7 @@ +name: sky +author: Chromium Authors +description: Dart files to support executing inside Sky. +homepage: https://github.com/domokit/mojo/sky +version: 0.0.1 +dependencies: + mojo: '>=0.0.1 <1.0.0' diff --git a/tools/deploy_sdk.py b/tools/deploy_sdk.py index 62b54e6bb4e..c74ab0da43c 100755 --- a/tools/deploy_sdk.py +++ b/tools/deploy_sdk.py @@ -160,6 +160,13 @@ def main(): 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') + copy_or_link(os.path.join(bindings_path, 'dart_sky.dart'), + sdk_path('packages/sky/sdk_additions/dart_sky.dart')) + # Not used in the dev environment. copy_or_link(src_path('sky/sdk/tools/sky'), sdk_path('packages/sky/bin/sky')) @@ -170,9 +177,15 @@ def main(): copy(os.path.join(build_dir, 'gen/mojo'), sdk_path('packages/mojo/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/dart_mojo_core.dart'), + sdk_path('packages/mojo/sdk_additions/dart_mojo_core.dart')) + if not skip_apks: ensure_dir_exists(sdk_path('apks')) - shutil.copy(os.path.join(build_dir, 'apks', 'SkyShell.apk'), + shutil.copy(os.path.join(build_dir, 'apks', 'SkyDemo.apk'), sdk_path('apks')) if generate_licenses: @@ -180,6 +193,11 @@ def main(): 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)