Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
58edc7ed
Commit
58edc7ed
authored
Mar 24, 2016
by
Alhaad Gokhale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
In run_mojo, rename bundlePath -> targetApp since it may not be a path.
parent
35e30235
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
run_mojo.dart
packages/flutter_tools/lib/src/commands/run_mojo.dart
+9
-9
No files found.
packages/flutter_tools/lib/src/commands/run_mojo.dart
View file @
58edc7ed
...
...
@@ -86,7 +86,7 @@ class RunMojoCommand extends FlutterCommand {
return
result
;
}
Future
<
List
<
String
>>
_getShellConfig
(
String
bundlePath
)
async
{
Future
<
List
<
String
>>
_getShellConfig
(
String
targetApp
)
async
{
List
<
String
>
args
=
<
String
>[];
final
bool
useDevtools
=
_useDevtools
();
...
...
@@ -109,9 +109,9 @@ class RunMojoCommand extends FlutterCommand {
args
.
add
(
'--android'
);
}
final
Uri
appUri
=
Uri
.
parse
(
bundlePath
);
final
Uri
appUri
=
Uri
.
parse
(
targetApp
);
if
(
appUri
.
scheme
.
isEmpty
||
appUri
.
scheme
==
'file'
)
{
final
String
appPath
=
_makePathAbsolute
(
bundlePath
);
final
String
appPath
=
_makePathAbsolute
(
targetApp
);
if
(
argResults
[
'android'
])
{
final
String
appName
=
path
.
basename
(
appPath
);
final
String
appDir
=
path
.
dirname
(
appPath
);
...
...
@@ -121,7 +121,7 @@ class RunMojoCommand extends FlutterCommand {
args
.
add
(
'mojo:launcher file://
$appPath
'
);
}
}
else
{
args
.
add
(
'mojo:launcher
$
bundlePath
'
);
args
.
add
(
'mojo:launcher
$
targetApp
'
);
}
// Add url-mapping for mojo:flutter.
...
...
@@ -164,21 +164,21 @@ class RunMojoCommand extends FlutterCommand {
await
downloadToolchain
();
String
bundlePath
=
argResults
[
'app'
];
if
(
bundlePath
==
null
)
{
bundlePath
=
_kDefaultBundlePath
;
String
targetApp
=
argResults
[
'app'
];
if
(
targetApp
==
null
)
{
targetApp
=
_kDefaultBundlePath
;
String
mainPath
=
findMainDartFile
(
argResults
[
'target'
]);
int
result
=
await
flx
.
build
(
toolchain
,
mainPath:
mainPath
,
outputPath:
bundlePath
outputPath:
targetApp
);
if
(
result
!=
0
)
return
result
;
}
return
await
runCommandAndStreamOutput
(
await
_getShellConfig
(
bundlePath
));
return
await
runCommandAndStreamOutput
(
await
_getShellConfig
(
targetApp
));
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment