firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1572 from abarth/bin_flutter

Browse Source 
Add a bin/flutter.dart to the flutter package
This commit is contained in:
Adam Barth 2015-10-11 12:03:21 -07:00
commit f0b7ef83ff
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/flutter/bin/flutter.dart Normal file
View File

@ -0,0 +1,7 @@
// 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 'package:sky_tools/executable.dart' as executable;
main(List<String> args) => executable.main(args);

12
packages/flutter/lib/sky_tool
View File

@ -1255,15 +1255,15 @@ class SkyShellRunner(object):
# Also make sure that args is consistent with machine state for local builds
if args.local_build and args.sky_src_path is None:
real_sky_path = os.path.realpath(os.path.join(PACKAGES_DIR, 'sky'))
match = re.match(r'pub.dartlang.org/sky', real_sky_path)
real_flutter_path = os.path.realpath(os.path.join(PACKAGES_DIR, 'flutter'))
match = re.match(r'pub.dartlang.org/flutter', real_flutter_path)
if match is not None:
args.local_build = False
else:
sky_src_path = os.path.dirname(
os.path.dirname(
os.path.dirname(
os.path.dirname(real_sky_path))))
os.path.dirname(real_flutter_path))))
if sky_src_path == '/' or sky_src_path == '':
args.local_build = False
else:
@ -1275,9 +1275,9 @@ class SkyShellRunner(object):
'to your pubspec.yaml file and then run pub get again:\n'
'dependency_overrides:\n'
' material_design_icons:\n'
' path: /path/to/sky_engine/src/sky/packages/material_design_icons\n'
' sky:\n'
' path: /path/to/sky_engine/src/sky/packages/sky\n')
' path: /path/to/flutter/engine/src/sky/packages/material_design_icons\n'
' flutter:\n'
' path: /path/to/flutter/engine/src/sky/packages/sky\n')
if args.local_build:
if not os.path.isdir(args.sky_src_path):
logging.warning('The selected sky-src-path (' + args.sky_src_path + ') does not exist.'

3
packages/flutter/pubspec.yaml
View File

@ -16,3 +16,6 @@ dependencies:
intl: '>=0.12.4+2 <0.13.0'
environment:
sdk: '>=1.12.0 <2.0.0'
executables:
flutter: