Merge pull request #313 from abarth/mv_sky_package

Move sky package into sky/packages/sky

CONTRIBUTING.md

@@ -46,7 +46,7 @@ target. Building on MacOS for Android, iOS, and a head-less MacOS target is comi
 * (Only the first time) `./tools/android/download_android_tools.py`
 * `./sky/tools/gn --android`
 * `ninja -C out/android_Debug`
-* `./sky/tools/shelldb start out/android_Debug/ sky/sdk/example/hello_world/lib/main.dart`
+* `./sky/tools/shelldb start out/android_Debug/ sky/packages/sky/example/hello_world/lib/main.dart`
 
 ### Linux (on Linux)
 
@@ -58,7 +58,7 @@ Running the code
 ----------------
 
 * `./sky/tools/test_sky --debug` runs the tests on the host machine using `out/Debug`.
-* `./out/Debug/sky_shell --package-root=out/Debug/gen/dart-pkg/packages sky/sdk/example/hello_world/lib/main.dart`
+* `./out/Debug/sky_shell --package-root=sky/packages/workbench/packages sky/packages/sky/example/hello_world/lib/main.dart`
   Note: Because Linux is headless, you won't see any UI. You can use `print` to generate console output or you can interact with the DartVM via observatory at [http://localhost:8181/](http://localhost:8181/).
 
 Contributing code

DEPS

@@ -230,7 +230,7 @@ hooks = [
                 '--repository-root', '../../../..',
                 '--dart-sdk-directory',
                 '../../../../third_party/dart-sdk/dart-sdk',
-                '--dirs-to-ignore', 'sky/sdk',
+                '--dirs-to-ignore', 'sky/packages/sky',
     ],
   },
   {

README.md

@@ -8,7 +8,7 @@ Sky is optimized for today's, and tomorrow's, mobile devices. We are focused
 on low-latency input, high frame rates, and we are purely mobile first.
 
  - For information about using Sky to build apps, please see
-   [Getting started with Sky](sky/sdk/README.md).
+   [Getting started with Sky](sky/packags/sky/README.md).
 
  - For information about contributing to Sky, please see
    [CONTRIBUTING.md](CONTRIBUTING.md).

build/config/ios/ios_sim.py

@@ -93,7 +93,7 @@ def Main():
                       help='Path to the simulator application.')
 
   parser.add_argument('-t', dest='target', required=False,
-                      default='sky/sdk/example/demo_launcher/lib/main.dart',
+                      default='sky/packages/sky/example/demo_launcher/lib/main.dart',
                       help='Sky server-relative path to the Sky app to run.')
 
   parser.add_argument('-s', dest='server', required=False,

sky/BUILD.gn

@@ -8,7 +8,7 @@ group("sky") {
   deps = [
     "//sky/engine/platform:platform_unittests($host_toolchain)",
     "//sky/engine/wtf:unittests($host_toolchain)",
-    "//sky/sdk/example",
+    "//sky/packages/sky/example",
     "//sky/tools/imagediff($host_toolchain)",
     "//sky/tools/sky_snapshot($host_toolchain)",
     ":sky_dev",
@@ -24,8 +24,7 @@ group("sky_dev") {
 
   deps = [
     "//sky/packages",
-    "//sky/sdk",
-    "//sky/sdk/example/demo_launcher",
+    "//sky/packages/sky/example/demo_launcher",
     "//sky/shell",
   ]
 

sky/build/skyx.gni

@@ -42,7 +42,6 @@ template("skyx") {
 
     deps = [
       "//sky/packages/workbench:init",
-      "//sky/sdk",
       "//sky/tools/sky_snapshot($host_toolchain)",
     ]
 

sky/sdk/example/BUILD.gn → sky/packages/sky/example/BUILD.gn

@@ -6,11 +6,11 @@ group("example") {
   testonly = true
 
   deps = [
-    "//sky/sdk/example/demo_launcher",
-    "//sky/sdk/example/game",
-    "//sky/sdk/example/mine_digger",
-    "//sky/sdk/example/rendering",
-    "//sky/sdk/example/stocks",
-    "//sky/sdk/example/widgets",
+    "//sky/packages/sky/example/demo_launcher",
+    "//sky/packages/sky/example/game",
+    "//sky/packages/sky/example/mine_digger",
+    "//sky/packages/sky/example/rendering",
+    "//sky/packages/sky/example/stocks",
+    "//sky/packages/sky/example/widgets",
   ]
 }

sky/sdk/example/demo_launcher/BUILD.gn → sky/packages/sky/example/demo_launcher/BUILD.gn

@@ -12,17 +12,17 @@ sky_app("demo_launcher") {
     apk_name = "SkyDemo"
 
     bundles = [
-      "//sky/sdk/example/fitness",
-      "//sky/sdk/example/game",
-      "//sky/sdk/example/mine_digger",
-      "//sky/sdk/example/rendering:interactive_flex",
-      "//sky/sdk/example/stocks",
-      "//sky/sdk/example/widgets:cards",
+      "//sky/packages/sky/example/fitness",
+      "//sky/packages/sky/example/game",
+      "//sky/packages/sky/example/mine_digger",
+      "//sky/packages/sky/example/rendering:interactive_flex",
+      "//sky/packages/sky/example/stocks",
+      "//sky/packages/sky/example/widgets:cards",
     ]
 
     deps = [
-      "//sky/sdk/example/demo_launcher/apk:java",
-      "//sky/sdk/example/demo_launcher/apk:resources",
+      "//sky/packages/sky/example/demo_launcher/apk:java",
+      "//sky/packages/sky/example/demo_launcher/apk:resources",
     ]
   }
 }

sky/sdk/example/game/BUILD.gn → sky/packages/sky/example/game/BUILD.gn

@@ -12,7 +12,7 @@ sky_app("game") {
     apk_name = "Asteroids"
 
     deps = [
-      "//sky/sdk/example/game/apk:resources",
+      "//sky/packages/sky/example/game/apk:resources",
     ]
   }
 }