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
8139a368
Unverified
Commit
8139a368
authored
May 29, 2019
by
Zachary Anderson
Committed by
GitHub
May 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tool] Use product runner in Fuchsia release build (#33282)
parent
52ae9968
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
6 deletions
+41
-6
fuchsia_build.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart
+33
-2
build_fuchsia_test.dart
packages/flutter_tools/test/commands/build_fuchsia_test.dart
+6
-3
fuchsa_device_test.dart
packages/flutter_tools/test/fuchsia/fuchsa_device_test.dart
+2
-1
No files found.
packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart
View file @
8139a368
...
@@ -5,10 +5,12 @@
...
@@ -5,10 +5,12 @@
import
'package:meta/meta.dart'
;
import
'package:meta/meta.dart'
;
import
'../asset.dart'
;
import
'../asset.dart'
;
import
'../base/common.dart'
;
import
'../base/file_system.dart'
;
import
'../base/file_system.dart'
;
import
'../base/io.dart'
;
import
'../base/io.dart'
;
import
'../build_info.dart'
;
import
'../build_info.dart'
;
import
'../bundle.dart'
;
import
'../bundle.dart'
;
import
'../convert.dart'
;
import
'../devfs.dart'
;
import
'../devfs.dart'
;
import
'../project.dart'
;
import
'../project.dart'
;
...
@@ -67,6 +69,31 @@ Future<void> _buildAssets(
...
@@ -67,6 +69,31 @@ Future<void> _buildAssets(
await
outFile
.
close
();
await
outFile
.
close
();
}
}
void
_rewriteCmx
(
BuildMode
mode
,
File
src
,
File
dst
)
{
final
Map
<
String
,
dynamic
>
cmx
=
json
.
decode
(
src
.
readAsStringSync
());
// If the app author has already specified the runner in the cmx file, then
// do not override it with something else.
if
(
cmx
.
containsKey
(
'runner'
))
{
dst
.
writeAsStringSync
(
json
.
encode
(
cmx
));
return
;
}
String
runner
;
switch
(
mode
)
{
case
BuildMode
.
debug
:
case
BuildMode
.
profile
:
runner
=
'flutter_jit_runner'
;
break
;
case
BuildMode
.
release
:
runner
=
'flutter_jit_product_runner'
;
break
;
default
:
throwToolExit
(
'Fuchsia does not support build mode "
$mode
"'
);
break
;
}
cmx
[
'runner'
]
=
'fuchsia-pkg://fuchsia.com/
$runner
#meta/
$runner
.cmx'
;
dst
.
writeAsStringSync
(
json
.
encode
(
cmx
));
}
// TODO(zra): Allow supplying a signing key.
// TODO(zra): Allow supplying a signing key.
Future
<
void
>
_buildPackage
(
Future
<
void
>
_buildPackage
(
FuchsiaProject
fuchsiaProject
,
FuchsiaProject
fuchsiaProject
,
...
@@ -85,13 +112,17 @@ Future<void> _buildPackage(
...
@@ -85,13 +112,17 @@ Future<void> _buildPackage(
pkg
.
createSync
(
recursive:
true
);
pkg
.
createSync
(
recursive:
true
);
}
}
final
File
srcCmx
=
fs
.
file
(
fs
.
path
.
join
(
fuchsiaProject
.
meta
.
path
,
'
$appName
.cmx'
));
final
File
dstCmx
=
fs
.
file
(
fs
.
path
.
join
(
outDir
,
'
$appName
.cmx'
));
_rewriteCmx
(
buildInfo
.
mode
,
srcCmx
,
dstCmx
);
// Concatenate dilpmanifest and pkgassets into package_manifest.
// Concatenate dilpmanifest and pkgassets into package_manifest.
final
File
manifestFile
=
fs
.
file
(
packageManifest
);
final
File
manifestFile
=
fs
.
file
(
packageManifest
);
manifestFile
.
writeAsStringSync
(
fs
.
file
(
dilpmanifest
).
readAsStringSync
());
manifestFile
.
writeAsStringSync
(
fs
.
file
(
dilpmanifest
).
readAsStringSync
());
manifestFile
.
writeAsStringSync
(
fs
.
file
(
pkgassets
).
readAsStringSync
(),
manifestFile
.
writeAsStringSync
(
fs
.
file
(
pkgassets
).
readAsStringSync
(),
mode:
FileMode
.
append
);
mode:
FileMode
.
append
);
manifestFile
.
writeAsStringSync
(
manifestFile
.
writeAsStringSync
(
'meta/
$appName
.cmx=
${dstCmx.path}
\n
'
,
'meta/
$appName
.cmx=
${fuchsiaProject.meta.path}
/
$appName
.cmx
\n
'
,
mode:
FileMode
.
append
);
mode:
FileMode
.
append
);
manifestFile
.
writeAsStringSync
(
'meta/package=
$pkgDir
/meta/package
\n
'
,
manifestFile
.
writeAsStringSync
(
'meta/package=
$pkgDir
/meta/package
\n
'
,
mode:
FileMode
.
append
);
mode:
FileMode
.
append
);
...
...
packages/flutter_tools/test/commands/build_fuchsia_test.dart
View file @
8139a368
...
@@ -84,7 +84,8 @@ void main() {
...
@@ -84,7 +84,8 @@ void main() {
const
String
appName
=
'app_name'
;
const
String
appName
=
'app_name'
;
fs
fs
.
file
(
fs
.
path
.
join
(
'fuchsia'
,
'meta'
,
'
$appName
.cmx'
))
.
file
(
fs
.
path
.
join
(
'fuchsia'
,
'meta'
,
'
$appName
.cmx'
))
.
createSync
(
recursive:
true
);
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'{}'
);
fs
.
file
(
'.packages'
).
createSync
();
fs
.
file
(
'.packages'
).
createSync
();
final
File
pubspecFile
=
fs
.
file
(
'pubspec.yaml'
)..
createSync
();
final
File
pubspecFile
=
fs
.
file
(
'pubspec.yaml'
)..
createSync
();
pubspecFile
.
writeAsStringSync
(
'name:
$appName
'
);
pubspecFile
.
writeAsStringSync
(
'name:
$appName
'
);
...
@@ -105,7 +106,8 @@ void main() {
...
@@ -105,7 +106,8 @@ void main() {
const
String
appName
=
'app_name'
;
const
String
appName
=
'app_name'
;
fs
fs
.
file
(
fs
.
path
.
join
(
'fuchsia'
,
'meta'
,
'
$appName
.cmx'
))
.
file
(
fs
.
path
.
join
(
'fuchsia'
,
'meta'
,
'
$appName
.cmx'
))
.
createSync
(
recursive:
true
);
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'{}'
);
fs
.
file
(
'.packages'
).
createSync
();
fs
.
file
(
'.packages'
).
createSync
();
fs
.
file
(
fs
.
path
.
join
(
'lib'
,
'main.dart'
)).
createSync
(
recursive:
true
);
fs
.
file
(
fs
.
path
.
join
(
'lib'
,
'main.dart'
)).
createSync
(
recursive:
true
);
final
File
pubspecFile
=
fs
.
file
(
'pubspec.yaml'
)..
createSync
();
final
File
pubspecFile
=
fs
.
file
(
'pubspec.yaml'
)..
createSync
();
...
@@ -127,7 +129,8 @@ void main() {
...
@@ -127,7 +129,8 @@ void main() {
const
String
appName
=
'app_name'
;
const
String
appName
=
'app_name'
;
fs
fs
.
file
(
fs
.
path
.
join
(
'fuchsia'
,
'meta'
,
'
$appName
.cmx'
))
.
file
(
fs
.
path
.
join
(
'fuchsia'
,
'meta'
,
'
$appName
.cmx'
))
.
createSync
(
recursive:
true
);
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'{}'
);
fs
.
file
(
'.packages'
).
createSync
();
fs
.
file
(
'.packages'
).
createSync
();
fs
.
file
(
fs
.
path
.
join
(
'lib'
,
'main.dart'
)).
createSync
(
recursive:
true
);
fs
.
file
(
fs
.
path
.
join
(
'lib'
,
'main.dart'
)).
createSync
(
recursive:
true
);
final
File
pubspecFile
=
fs
.
file
(
'pubspec.yaml'
)..
createSync
();
final
File
pubspecFile
=
fs
.
file
(
'pubspec.yaml'
)..
createSync
();
...
...
packages/flutter_tools/test/fuchsia/fuchsa_device_test.dart
View file @
8139a368
...
@@ -434,7 +434,8 @@ void main() {
...
@@ -434,7 +434,8 @@ void main() {
app
=
FuchsiaApp
.
fromPrebuiltApp
(
far
);
app
=
FuchsiaApp
.
fromPrebuiltApp
(
far
);
}
else
{
}
else
{
fs
.
file
(
fs
.
path
.
join
(
'fuchsia'
,
'meta'
,
'
$appName
.cmx'
))
fs
.
file
(
fs
.
path
.
join
(
'fuchsia'
,
'meta'
,
'
$appName
.cmx'
))
.
createSync
(
recursive:
true
);
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'{}'
);
fs
.
file
(
'.packages'
).
createSync
();
fs
.
file
(
'.packages'
).
createSync
();
fs
.
file
(
fs
.
path
.
join
(
'lib'
,
'main.dart'
)).
createSync
(
recursive:
true
);
fs
.
file
(
fs
.
path
.
join
(
'lib'
,
'main.dart'
)).
createSync
(
recursive:
true
);
app
=
BuildableFuchsiaApp
(
project:
FlutterProject
.
current
().
fuchsia
);
app
=
BuildableFuchsiaApp
(
project:
FlutterProject
.
current
().
fuchsia
);
...
...
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