Skip to content

Commit

Permalink
Move sky package into sky/packages/sky
Browse files Browse the repository at this point in the history
This patch makes the sky package match the structure we've adopted for the
other Dart packages we produce from this repo.
  • Loading branch information
abarth committed Jul 28, 2015
1 parent aaa5c9f commit eb83294
Show file tree
Hide file tree
Showing 259 changed files with 69 additions and 104 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
},
{
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion build/config/ios/ios_sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions sky/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
]

Expand Down
1 change: 0 additions & 1 deletion sky/build/skyx.gni
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ template("skyx") {

deps = [
"//sky/packages/workbench:init",
"//sky/sdk",
"//sky/tools/sky_snapshot($host_toolchain)",
]

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions sky/packages/sky/example/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# 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.

group("example") {
testonly = true

deps = [
"//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",
]
}
File renamed without changes.
File renamed without changes.
28 changes: 28 additions & 0 deletions sky/packages/sky/example/demo_launcher/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 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("//sky/build/sky_app.gni")

sky_app("demo_launcher") {
main_dart = "lib/main.dart"
manifest = "sky.yaml"

if (is_android) {
apk_name = "SkyDemo"

bundles = [
"//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/packages/sky/example/demo_launcher/apk:java",
"//sky/packages/sky/example/demo_launcher/apk:resources",
]
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sky_app("game") {
apk_name = "Asteroids"

deps = [
"//sky/sdk/example/game/apk:resources",
"//sky/packages/sky/example/game/apk:resources",
]
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion sky/sdk/pubspec.yaml → sky/packages/sky/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: sky
version: 0.0.23
author: Chromium Authors <[email protected]>
description: A framework for writing Sky applications
homepage: https://github.com/domokit/sky_engine/tree/master/sky/sdk
homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/sky
dependencies:
cassowary: ^0.1.7
material_design_icons: ^0.0.2
Expand Down
2 changes: 1 addition & 1 deletion sky/packages/workbench/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ action("init") {
stamp = "$target_gen_dir/sky_init.stamp"

script = "//sky/build/sky_init.py"
sources = [ "//sky/sdk/pubspec.yaml" ]
sources = [ "//sky/packages/sky/pubspec.yaml" ]
outputs = [ stamp ]

args = [
Expand Down
2 changes: 1 addition & 1 deletion sky/packages/workbench/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ dependency_overrides:
material_design_icons:
path: ../material_design_icons
sky:
path: ../../sdk
path: ../sky
environment:
sdk: '>=1.8.0 <2.0.0'
33 changes: 0 additions & 33 deletions sky/sdk/BUILD.gn

This file was deleted.

16 changes: 0 additions & 16 deletions sky/sdk/example/BUILD.gn

This file was deleted.

28 changes: 0 additions & 28 deletions sky/sdk/example/demo_launcher/BUILD.gn

This file was deleted.

2 changes: 1 addition & 1 deletion sky/tests/examples/card_collection.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:async';

import 'package:sky/widgets/widget.dart';

import '../../sdk/example/widgets/card_collection.dart';
import '../../packages/sky/example/widgets/card_collection.dart';
import '../resources/display_list.dart';

main() async {
Expand Down
2 changes: 1 addition & 1 deletion sky/tests/examples/sector.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:async';

import 'package:sky/widgets/widget.dart';

import '../../sdk/example/widgets/sector.dart';
import '../../packages/sky/example/widgets/sector.dart';
import '../resources/display_list.dart';

main() async {
Expand Down
4 changes: 2 additions & 2 deletions sky/tests/examples/stocks.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import 'dart:async';

import 'package:sky/widgets/widget.dart';

import '../../sdk/example/stocks/lib/main.dart';
import '../../sdk/example/stocks/lib/stock_data.dart';
import '../../packages/sky/example/stocks/lib/main.dart';
import '../../packages/sky/example/stocks/lib/stock_data.dart';
import '../resources/display_list.dart';

class TestStocksApp extends StocksApp {
Expand Down
2 changes: 1 addition & 1 deletion sky/tests/examples/styled_text.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:async';

import 'package:sky/widgets/widget.dart';

import '../../sdk/example/widgets/styled_text.dart';
import '../../packages/sky/example/widgets/styled_text.dart';
import '../resources/display_list.dart';

main() async {
Expand Down
2 changes: 1 addition & 1 deletion sky/tests/examples/tabs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:async';

import 'package:sky/widgets/widget.dart';

import '../../sdk/example/widgets/tabs.dart';
import '../../packages/sky/example/widgets/tabs.dart';
import '../resources/display_list.dart';

main() async {
Expand Down
2 changes: 1 addition & 1 deletion sky/tests/raw/render_flex.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:sky' as sky;

import 'package:sky/rendering/box.dart';

import '../../sdk/example/rendering/flex.dart';
import '../../packages/sky/example/rendering/flex.dart';
import '../resources/display_list.dart';
import '../resources/third_party/unittest/unittest.dart';
import '../resources/unit.dart';
Expand Down
2 changes: 1 addition & 1 deletion sky/tests/raw/sector_layout.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import 'dart:async';

import '../../sdk/example/rendering/sector_layout.dart';
import '../../packages/sky/example/rendering/sector_layout.dart';
import '../resources/display_list.dart';

void main() {
Expand Down
4 changes: 2 additions & 2 deletions sky/tools/big_red_button.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def main():
pub_path = os.path.join(dart_sdk_root, 'bin/pub')
android_dist_root = os.path.join(sky_engine_root, 'out/android_Release/dist')
linux_dist_root = os.path.join(sky_engine_root, 'out/Release/dist')
sky_package_root = os.path.join(sky_engine_root, 'sky/sdk')
sky_package_root = os.path.join(sky_engine_root, 'sky/packages/sky')
sky_engine_package_root = os.path.join(android_dist_root, 'packages/sky_engine/sky_engine')
sky_services_package_root = os.path.join(android_dist_root, 'packages/sky_services/sky_services')

Expand All @@ -112,7 +112,7 @@ def main():
run(sky_engine_root, ['sky/tools/gn', '--release'])
run(sky_engine_root, ['ninja', '-C', 'out/Release', ':dist'])

run(sky_engine_root, ['cp', 'AUTHORS', 'LICENSE', 'sky/sdk'])
run(sky_engine_root, ['cp', 'AUTHORS', 'LICENSE', sky_package_root])

upload_artifacts(android_dist_root, 'android-arm', commit_hash)
upload_artifacts(linux_dist_root, 'linux-x64', commit_hash)
Expand Down
4 changes: 2 additions & 2 deletions sky/tools/roll_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@


PUBSPECS = [
'sky/packages/sky/pubspec.yaml',
'sky/packages/sky_engine/pubspec.yaml',
'sky/sdk/pubspec.yaml',
]

MANIFESTS = [
'sky/sdk/example/demo_launcher/apk/AndroidManifest.xml',
'sky/packages/sky/example/demo_launcher/apk/AndroidManifest.xml',
]

MANIFEST_PREFACE = '''<?xml version="1.0" encoding="utf-8"?>
Expand Down
2 changes: 1 addition & 1 deletion sky/tools/webkitpy/layout_tests/run_webkit_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ def run_analyzer(port, options, args, logging_stream):
sky_tools_dir = os.path.dirname(os.path.dirname(test_dir))
analyzer_path = os.path.join(sky_tools_dir, 'skyanalyzer')
src_dir = os.path.dirname(os.path.dirname(sky_tools_dir))
analyzer_target_path = os.path.join(src_dir, 'sky/sdk/example/stocks/lib/main.dart')
analyzer_target_path = os.path.join(src_dir, 'sky/packages/sky/example/stocks/lib/main.dart')
analyzer_args = [
analyzer_path,
analyzer_target_path
Expand Down
2 changes: 1 addition & 1 deletion travis/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ set -ex

./sky/tools/gn --release
ninja -j 4 -C out/Release
./sky/tools/skyanalyzer --congratulate sky/sdk/example/stocks/lib/main.dart
./sky/tools/skyanalyzer --congratulate sky/packags/sky/example/stocks/lib/main.dart

0 comments on commit eb83294

Please sign in to comment.