From 4bd4d4e0fd8d6df73ddef7a43df142439c7f1e64 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Fri, 10 Jul 2015 12:12:10 -0700 Subject: [PATCH] Fix typos and error handling in setup_dart_analyzer TBR=eseidel@google.com Review URL: https://codereview.chromium.org/1235673002 . --- .../tools/{setup-dart-analyzer => setup_dart_analyzer} | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) rename engine/src/flutter/tools/{setup-dart-analyzer => setup_dart_analyzer} (84%) diff --git a/engine/src/flutter/tools/setup-dart-analyzer b/engine/src/flutter/tools/setup_dart_analyzer similarity index 84% rename from engine/src/flutter/tools/setup-dart-analyzer rename to engine/src/flutter/tools/setup_dart_analyzer index 434774e5a50..65e69cc5ac2 100755 --- a/engine/src/flutter/tools/setup-dart-analyzer +++ b/engine/src/flutter/tools/setup_dart_analyzer @@ -19,8 +19,8 @@ SDK_EXT = os.path.join(SKY_SDK_DIR, 'lib', '_sdkext') SDK_EXT_TEMPLATE = '''{ "dart:sky": "%(build_dir)s/gen/dart-pkg/sky/sdk_ext/dart_sky.dart", - "dart:sky.internals": "%(build_dir)s/gen/dart-pkg/sky/sky_internals.dart", - "dart:sky_builtin_natvies": "%(build_dir)s../sdk_ext/builtin_natives.dart" + "dart:sky.internals": "%(build_dir)s/gen/dart-pkg/sky/sdk_ext/sky_internals.dart", + "dart:sky_builtin_natvies": "%(build_dir)s/gen/dart-pkg/sky/sdk_ext/builtin_natives.dart" }''' def version_for_pubspec(pubspec_path): @@ -48,6 +48,12 @@ def main(): args = parser.parse_args() dart_pkg_dir = os.path.join(args.build_dir, 'gen', 'dart-pkg') + + if not os.path.exists(dart_pkg_dir): + print 'Cannot find Dart pacakges at "%s".' % dart_pkg_dir + print 'Did you run `ninja -C %s sky` ?' % os.path.relpath(args.build_dir, os.getcwd()) + return 1 + packages = {} with open(SKY_PUBSPEC, 'r') as stream: