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
84a476a4
Unverified
Commit
84a476a4
authored
Sep 25, 2019
by
Jonah Williams
Committed by
GitHub
Sep 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-Re-land Implement flutter build bundle with assemble (#41230)
parent
7bf9aea2
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
365 additions
and
29 deletions
+365
-29
gradle_plugin_light_apk_test.dart
dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart
+1
-1
apk_utils.dart
dev/devicelab/lib/framework/apk_utils.dart
+15
-11
artifacts.dart
packages/flutter_tools/lib/src/artifacts.dart
+4
-1
build_system.dart
...ages/flutter_tools/lib/src/build_system/build_system.dart
+11
-4
file_hash_store.dart
...s/flutter_tools/lib/src/build_system/file_hash_store.dart
+2
-2
assets.dart
...es/flutter_tools/lib/src/build_system/targets/assets.dart
+37
-0
dart.dart
...ages/flutter_tools/lib/src/build_system/targets/dart.dart
+112
-4
bundle.dart
packages/flutter_tools/lib/src/bundle.dart
+76
-0
codegen.dart
packages/flutter_tools/lib/src/codegen.dart
+0
-2
assemble.dart
packages/flutter_tools/lib/src/commands/assemble.dart
+0
-4
build_bundle.dart
packages/flutter_tools/lib/src/commands/build_bundle.dart
+1
-0
build_system_test.dart
...ls/test/general.shard/build_system/build_system_test.dart
+25
-0
filecache_test.dart
...tools/test/general.shard/build_system/filecache_test.dart
+13
-0
dart_test.dart
...ls/test/general.shard/build_system/targets/dart_test.dart
+1
-0
bundle_shim_test.dart
...es/flutter_tools/test/general.shard/bundle_shim_test.dart
+67
-0
No files found.
dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart
View file @
84a476a4
...
@@ -139,7 +139,7 @@ Future<void> main() async {
...
@@ -139,7 +139,7 @@ Future<void> main() async {
await
runProjectTest
((
FlutterProject
project
)
async
{
await
runProjectTest
((
FlutterProject
project
)
async
{
section
(
'gradlew assembleDebug'
);
section
(
'gradlew assembleDebug'
);
await
project
.
runGradleTask
(
'assembleDebug'
);
await
project
.
runGradleTask
(
'assembleDebug'
);
final
String
errorMessage
=
validateSnapshotDependency
(
project
,
'
build/app.dill
'
);
final
String
errorMessage
=
validateSnapshotDependency
(
project
,
'
kernel_blob.bin
'
);
if
(
errorMessage
!=
null
)
{
if
(
errorMessage
!=
null
)
{
throw
TaskResult
.
failure
(
errorMessage
);
throw
TaskResult
.
failure
(
errorMessage
);
}
}
...
...
dev/devicelab/lib/framework/apk_utils.dart
View file @
84a476a4
...
@@ -382,15 +382,19 @@ Future<ProcessResult> _resultOfGradleTask({String workingDirectory, String task,
...
@@ -382,15 +382,19 @@ Future<ProcessResult> _resultOfGradleTask({String workingDirectory, String task,
class
_Dependencies
{
class
_Dependencies
{
_Dependencies
(
String
depfilePath
)
{
_Dependencies
(
String
depfilePath
)
{
final
RegExp
_separatorExpr
=
RegExp
(
r'([^\\]) '
);
final
RegExp
_escapeExpr
=
RegExp
(
r'\\(.)'
);
// Depfile format:
// Depfile format:
// outfile1 outfile2 : file1.dart file2.dart file3.dart file\ 4.dart
// outfile1 outfile2 : file1.dart file2.dart file3.dart file\ 4.dart
final
String
contents
=
File
(
depfilePath
).
readAsStringSync
();
final
String
contents
=
File
(
depfilePath
).
readAsStringSync
();
final
List
<
String
>
colonSeparated
=
contents
.
split
(
': '
);
final
List
<
String
>
colonSeparated
=
contents
.
split
(
':'
);
target
=
colonSeparated
[
0
].
trim
();
targets
=
_processList
(
colonSeparated
[
0
].
trim
());
dependencies
=
colonSeparated
[
1
]
dependencies
=
_processList
(
colonSeparated
[
1
].
trim
());
}
final
RegExp
_separatorExpr
=
RegExp
(
r'([^\\]) '
);
final
RegExp
_escapeExpr
=
RegExp
(
r'\\(.)'
);
Set
<
String
>
_processList
(
String
rawText
)
{
return
rawText
// Put every file on right-hand side on the separate line
// Put every file on right-hand side on the separate line
.
replaceAllMapped
(
_separatorExpr
,
(
Match
match
)
=>
'
${match.group(1)}
\n
'
)
.
replaceAllMapped
(
_separatorExpr
,
(
Match
match
)
=>
'
${match.group(1)}
\n
'
)
.
split
(
'
\n
'
)
.
split
(
'
\n
'
)
...
@@ -400,7 +404,7 @@ class _Dependencies {
...
@@ -400,7 +404,7 @@ class _Dependencies {
.
toSet
();
.
toSet
();
}
}
S
tring
target
;
S
et
<
String
>
targets
;
Set
<
String
>
dependencies
;
Set
<
String
>
dependencies
;
}
}
...
@@ -409,6 +413,6 @@ String validateSnapshotDependency(FlutterProject project, String expectedTarget)
...
@@ -409,6 +413,6 @@ String validateSnapshotDependency(FlutterProject project, String expectedTarget)
final
_Dependencies
deps
=
_Dependencies
(
final
_Dependencies
deps
=
_Dependencies
(
path
.
join
(
project
.
rootPath
,
'build'
,
'app'
,
'intermediates'
,
path
.
join
(
project
.
rootPath
,
'build'
,
'app'
,
'intermediates'
,
'flutter'
,
'debug'
,
'android-arm'
,
'snapshot_blob.bin.d'
));
'flutter'
,
'debug'
,
'android-arm'
,
'snapshot_blob.bin.d'
));
return
deps
.
target
==
expectedTarget
?
null
:
return
deps
.
target
s
.
any
((
String
target
)
=>
target
.
contains
(
expectedTarget
))
?
null
:
'Dependency file should have
$expectedTarget
as target. Instead has
${deps.target
}
'
;
'Dependency file should have
$expectedTarget
as target. Instead has
${deps.targets
}
'
;
}
}
packages/flutter_tools/lib/src/artifacts.dart
View file @
84a476a4
...
@@ -92,6 +92,9 @@ String _artifactToFileName(Artifact artifact, [ TargetPlatform platform, BuildMo
...
@@ -92,6 +92,9 @@ String _artifactToFileName(Artifact artifact, [ TargetPlatform platform, BuildMo
case
Artifact
.
frontendServerSnapshotForEngineDartSdk
:
case
Artifact
.
frontendServerSnapshotForEngineDartSdk
:
return
'frontend_server.dart.snapshot'
;
return
'frontend_server.dart.snapshot'
;
case
Artifact
.
engineDartBinary
:
case
Artifact
.
engineDartBinary
:
if
(
platform
==
TargetPlatform
.
windows_x64
)
{
return
'dart.exe'
;
}
return
'dart'
;
return
'dart'
;
case
Artifact
.
dart2jsSnapshot
:
case
Artifact
.
dart2jsSnapshot
:
return
'dart2js.dart.snapshot'
;
return
'dart2js.dart.snapshot'
;
...
@@ -265,7 +268,7 @@ class CachedArtifacts extends Artifacts {
...
@@ -265,7 +268,7 @@ class CachedArtifacts extends Artifacts {
case
Artifact
.
engineDartSdkPath
:
case
Artifact
.
engineDartSdkPath
:
return
dartSdkPath
;
return
dartSdkPath
;
case
Artifact
.
engineDartBinary
:
case
Artifact
.
engineDartBinary
:
return
fs
.
path
.
join
(
dartSdkPath
,
'bin'
,
_artifactToFileName
(
artifact
));
return
fs
.
path
.
join
(
dartSdkPath
,
'bin'
,
_artifactToFileName
(
artifact
,
platform
));
case
Artifact
.
platformKernelDill
:
case
Artifact
.
platformKernelDill
:
return
fs
.
path
.
join
(
_getFlutterPatchedSdkPath
(
mode
),
_artifactToFileName
(
artifact
));
return
fs
.
path
.
join
(
_getFlutterPatchedSdkPath
(
mode
),
_artifactToFileName
(
artifact
));
case
Artifact
.
platformLibrariesJson
:
case
Artifact
.
platformLibrariesJson
:
...
...
packages/flutter_tools/lib/src/build_system/build_system.dart
View file @
84a476a4
...
@@ -10,6 +10,7 @@ import 'package:crypto/crypto.dart';
...
@@ -10,6 +10,7 @@ import 'package:crypto/crypto.dart';
import
'package:meta/meta.dart'
;
import
'package:meta/meta.dart'
;
import
'package:pool/pool.dart'
;
import
'package:pool/pool.dart'
;
import
'../base/context.dart'
;
import
'../base/file_system.dart'
;
import
'../base/file_system.dart'
;
import
'../base/platform.dart'
;
import
'../base/platform.dart'
;
import
'../cache.dart'
;
import
'../cache.dart'
;
...
@@ -21,6 +22,9 @@ import 'source.dart';
...
@@ -21,6 +22,9 @@ import 'source.dart';
export
'source.dart'
;
export
'source.dart'
;
/// The [BuildSystem] instance.
BuildSystem
get
buildSystem
=>
context
.
get
<
BuildSystem
>();
/// Configuration for the build system itself.
/// Configuration for the build system itself.
class
BuildSystemConfig
{
class
BuildSystemConfig
{
/// Create a new [BuildSystemConfig].
/// Create a new [BuildSystemConfig].
...
@@ -497,14 +501,14 @@ class _BuildInstance {
...
@@ -497,14 +501,14 @@ class _BuildInstance {
}
}
if
(
canSkip
)
{
if
(
canSkip
)
{
skipped
=
true
;
skipped
=
true
;
print
Status
(
'Skipping target:
${node.target.name}
'
);
print
Trace
(
'Skipping target:
${node.target.name}
'
);
for
(
File
output
in
node
.
outputs
)
{
for
(
File
output
in
node
.
outputs
)
{
outputFiles
[
output
.
path
]
=
output
;
outputFiles
[
output
.
path
]
=
output
;
}
}
}
else
{
}
else
{
print
Status
(
'
${node.target.name}
: Starting due to
${node.invalidatedReasons}
'
);
print
Trace
(
'
${node.target.name}
: Starting due to
${node.invalidatedReasons}
'
);
await
node
.
target
.
build
(
environment
);
await
node
.
target
.
build
(
environment
);
print
Status
(
'
${node.target.name}
: Complete'
);
print
Trace
(
'
${node.target.name}
: Complete'
);
// Update hashes for output files.
// Update hashes for output files.
await
fileCache
.
hashFiles
(
node
.
outputs
);
await
fileCache
.
hashFiles
(
node
.
outputs
);
...
@@ -515,7 +519,10 @@ class _BuildInstance {
...
@@ -515,7 +519,10 @@ class _BuildInstance {
// Delete outputs from previous stages that are no longer a part of the build.
// Delete outputs from previous stages that are no longer a part of the build.
for
(
String
previousOutput
in
node
.
previousOutputs
)
{
for
(
String
previousOutput
in
node
.
previousOutputs
)
{
if
(!
outputFiles
.
containsKey
(
previousOutput
))
{
if
(!
outputFiles
.
containsKey
(
previousOutput
))
{
fs
.
file
(
previousOutput
).
deleteSync
();
final
File
previousFile
=
fs
.
file
(
previousOutput
);
if
(
previousFile
.
existsSync
())
{
previousFile
.
deleteSync
();
}
}
}
}
}
}
}
...
...
packages/flutter_tools/lib/src/build_system/file_hash_store.dart
View file @
84a476a4
...
@@ -103,7 +103,7 @@ class FileHashStore {
...
@@ -103,7 +103,7 @@ class FileHashStore {
FileStorage
fileStorage
;
FileStorage
fileStorage
;
try
{
try
{
fileStorage
=
FileStorage
.
fromBuffer
(
data
);
fileStorage
=
FileStorage
.
fromBuffer
(
data
);
}
on
FormatException
{
}
catch
(
err
)
{
printTrace
(
'Filestorage format changed'
);
printTrace
(
'Filestorage format changed'
);
_cacheFile
.
deleteSync
();
_cacheFile
.
deleteSync
();
return
;
return
;
...
@@ -123,7 +123,7 @@ class FileHashStore {
...
@@ -123,7 +123,7 @@ class FileHashStore {
printTrace
(
'Persisting file store'
);
printTrace
(
'Persisting file store'
);
final
File
file
=
_cacheFile
;
final
File
file
=
_cacheFile
;
if
(!
file
.
existsSync
())
{
if
(!
file
.
existsSync
())
{
file
.
createSync
();
file
.
createSync
(
recursive:
true
);
}
}
final
List
<
FileHash
>
fileHashes
=
<
FileHash
>[];
final
List
<
FileHash
>
fileHashes
=
<
FileHash
>[];
for
(
MapEntry
<
String
,
String
>
entry
in
currentHashes
.
entries
)
{
for
(
MapEntry
<
String
,
String
>
entry
in
currentHashes
.
entries
)
{
...
...
packages/flutter_tools/lib/src/build_system/targets/assets.dart
View file @
84a476a4
...
@@ -48,6 +48,43 @@ class AssetBehavior extends SourceBehavior {
...
@@ -48,6 +48,43 @@ class AssetBehavior extends SourceBehavior {
}
}
}
}
/// A specific asset behavior for building bundles.
class
AssetOutputBehavior
extends
SourceBehavior
{
const
AssetOutputBehavior
();
@override
List
<
File
>
inputs
(
Environment
environment
)
{
final
AssetBundle
assetBundle
=
AssetBundleFactory
.
instance
.
createBundle
();
assetBundle
.
build
(
manifestPath:
environment
.
projectDir
.
childFile
(
'pubspec.yaml'
).
path
,
packagesPath:
environment
.
projectDir
.
childFile
(
'.packages'
).
path
,
);
// Filter the file type to remove the files that are generated by this
// command as inputs.
final
List
<
File
>
results
=
<
File
>[];
final
Iterable
<
DevFSFileContent
>
files
=
assetBundle
.
entries
.
values
.
whereType
<
DevFSFileContent
>();
for
(
DevFSFileContent
devFsContent
in
files
)
{
results
.
add
(
fs
.
file
(
devFsContent
.
file
.
path
));
}
return
results
;
}
@override
List
<
File
>
outputs
(
Environment
environment
)
{
final
AssetBundle
assetBundle
=
AssetBundleFactory
.
instance
.
createBundle
();
assetBundle
.
build
(
manifestPath:
environment
.
projectDir
.
childFile
(
'pubspec.yaml'
).
path
,
packagesPath:
environment
.
projectDir
.
childFile
(
'.packages'
).
path
,
);
final
List
<
File
>
results
=
<
File
>[];
for
(
String
key
in
assetBundle
.
entries
.
keys
)
{
final
File
file
=
fs
.
file
(
fs
.
path
.
join
(
environment
.
outputDir
.
path
,
key
));
results
.
add
(
file
);
}
return
results
;
}
}
/// Copy the assets defined in the flutter manifest into a build directory.
/// Copy the assets defined in the flutter manifest into a build directory.
class
CopyAssets
extends
Target
{
class
CopyAssets
extends
Target
{
const
CopyAssets
();
const
CopyAssets
();
...
...
packages/flutter_tools/lib/src/build_system/targets/dart.dart
View file @
84a476a4
...
@@ -2,17 +2,22 @@
...
@@ -2,17 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// found in the LICENSE file.
import
'package:pool/pool.dart'
;
import
'../../artifacts.dart'
;
import
'../../artifacts.dart'
;
import
'../../asset.dart'
;
import
'../../base/build.dart'
;
import
'../../base/build.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/file_system.dart'
;
import
'../../base/platform.dart'
;
import
'../../base/platform.dart'
;
import
'../../build_info.dart'
;
import
'../../build_info.dart'
;
import
'../../compile.dart'
;
import
'../../compile.dart'
;
import
'../../dart/package_map.dart'
;
import
'../../dart/package_map.dart'
;
import
'../../devfs.dart'
;
import
'../../globals.dart'
;
import
'../../globals.dart'
;
import
'../../project.dart'
;
import
'../../project.dart'
;
import
'../build_system.dart'
;
import
'../build_system.dart'
;
import
'../exceptions.dart'
;
import
'../exceptions.dart'
;
import
'assets.dart'
;
/// The define to pass a [BuildMode].
/// The define to pass a [BuildMode].
const
String
kBuildMode
=
'BuildMode'
;
const
String
kBuildMode
=
'BuildMode'
;
...
@@ -55,6 +60,111 @@ List<File> listDartSources(Environment environment) {
...
@@ -55,6 +60,111 @@ List<File> listDartSources(Environment environment) {
return
dartFiles
;
return
dartFiles
;
}
}
/// Copies the prebuilt flutter bundle.
// This is a one-off rule for implementing build bundle in terms of assemble.
class
CopyFlutterBundle
extends
Target
{
const
CopyFlutterBundle
();
@override
String
get
name
=>
'copy_flutter_bundle'
;
@override
List
<
Source
>
get
inputs
=>
const
<
Source
>[
Source
.
artifact
(
Artifact
.
vmSnapshotData
,
mode:
BuildMode
.
debug
),
Source
.
artifact
(
Artifact
.
isolateSnapshotData
,
mode:
BuildMode
.
debug
),
Source
.
pattern
(
'{BUILD_DIR}/app.dill'
),
Source
.
behavior
(
AssetOutputBehavior
())
];
@override
List
<
Source
>
get
outputs
=>
const
<
Source
>[
Source
.
pattern
(
'{OUTPUT_DIR}/vm_snapshot_data'
),
Source
.
pattern
(
'{OUTPUT_DIR}/isolate_snapshot_data'
),
Source
.
pattern
(
'{OUTPUT_DIR}/kernel_blob.bin'
),
Source
.
pattern
(
'{OUTPUT_DIR}/AssetManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/FontManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/LICENSE'
),
Source
.
behavior
(
AssetOutputBehavior
())
];
@override
Future
<
void
>
build
(
Environment
environment
)
async
{
if
(
environment
.
defines
[
kBuildMode
]
==
null
)
{
throw
MissingDefineException
(
kBuildMode
,
'copy_flutter_bundle'
);
}
final
BuildMode
buildMode
=
getBuildModeForName
(
environment
.
defines
[
kBuildMode
]);
// We're not smart enough to only remove assets that are removed. If
// anything changes blow away the whole directory.
if
(
environment
.
outputDir
.
existsSync
())
{
environment
.
outputDir
.
deleteSync
(
recursive:
true
);
}
environment
.
outputDir
.
createSync
(
recursive:
true
);
// Only copy the prebuilt runtimes and kernel blob in debug mode.
if
(
buildMode
==
BuildMode
.
debug
)
{
final
String
vmSnapshotData
=
artifacts
.
getArtifactPath
(
Artifact
.
vmSnapshotData
,
mode:
BuildMode
.
debug
);
final
String
isolateSnapshotData
=
artifacts
.
getArtifactPath
(
Artifact
.
isolateSnapshotData
,
mode:
BuildMode
.
debug
);
environment
.
buildDir
.
childFile
(
'app.dill'
)
.
copySync
(
environment
.
outputDir
.
childFile
(
'kernel_blob.bin'
).
path
);
fs
.
file
(
vmSnapshotData
)
.
copySync
(
environment
.
outputDir
.
childFile
(
'vm_snapshot_data'
).
path
);
fs
.
file
(
isolateSnapshotData
)
.
copySync
(
environment
.
outputDir
.
childFile
(
'isolate_snapshot_data'
).
path
);
}
final
AssetBundle
assetBundle
=
AssetBundleFactory
.
instance
.
createBundle
();
await
assetBundle
.
build
();
final
Pool
pool
=
Pool
(
64
);
await
Future
.
wait
<
void
>(
assetBundle
.
entries
.
entries
.
map
<
Future
<
void
>>((
MapEntry
<
String
,
DevFSContent
>
entry
)
async
{
final
PoolResource
resource
=
await
pool
.
request
();
try
{
final
File
file
=
fs
.
file
(
fs
.
path
.
join
(
environment
.
outputDir
.
path
,
entry
.
key
));
file
.
parent
.
createSync
(
recursive:
true
);
final
DevFSContent
content
=
entry
.
value
;
if
(
content
is
DevFSFileContent
&&
content
.
file
is
File
)
{
await
(
content
.
file
as
File
).
copy
(
file
.
path
);
}
else
{
await
file
.
writeAsBytes
(
await
entry
.
value
.
contentsAsBytes
());
}
}
finally
{
resource
.
release
();
}
}));
}
@override
List
<
Target
>
get
dependencies
=>
const
<
Target
>[
KernelSnapshot
(),
];
}
/// Copies the prebuilt flutter bundle for release mode.
class
ReleaseCopyFlutterBundle
extends
CopyFlutterBundle
{
const
ReleaseCopyFlutterBundle
();
@override
String
get
name
=>
'release_flutter_bundle'
;
@override
List
<
Source
>
get
inputs
=>
const
<
Source
>[
Source
.
behavior
(
AssetOutputBehavior
())
];
@override
List
<
Source
>
get
outputs
=>
const
<
Source
>[
Source
.
pattern
(
'{OUTPUT_DIR}/AssetManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/FontManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/LICENSE'
),
Source
.
behavior
(
AssetOutputBehavior
())
];
@override
List
<
Target
>
get
dependencies
=>
const
<
Target
>[];
}
/// Generate a snapshot of the dart code used in the program.
/// Generate a snapshot of the dart code used in the program.
class
KernelSnapshot
extends
Target
{
class
KernelSnapshot
extends
Target
{
const
KernelSnapshot
();
const
KernelSnapshot
();
...
@@ -91,8 +201,7 @@ class KernelSnapshot extends Target {
...
@@ -91,8 +201,7 @@ class KernelSnapshot extends Target {
final
BuildMode
buildMode
=
getBuildModeForName
(
environment
.
defines
[
kBuildMode
]);
final
BuildMode
buildMode
=
getBuildModeForName
(
environment
.
defines
[
kBuildMode
]);
final
String
targetFile
=
environment
.
defines
[
kTargetFile
]
??
fs
.
path
.
join
(
'lib'
,
'main.dart'
);
final
String
targetFile
=
environment
.
defines
[
kTargetFile
]
??
fs
.
path
.
join
(
'lib'
,
'main.dart'
);
final
String
packagesPath
=
environment
.
projectDir
.
childFile
(
'.packages'
).
path
;
final
String
packagesPath
=
environment
.
projectDir
.
childFile
(
'.packages'
).
path
;
final
PackageUriMapper
packageUriMapper
=
PackageUriMapper
(
targetFile
,
final
String
targetFileAbsolute
=
fs
.
file
(
targetFile
).
absolute
.
path
;
packagesPath
,
null
,
null
);
final
CompilerOutput
output
=
await
compiler
.
compile
(
final
CompilerOutput
output
=
await
compiler
.
compile
(
sdkRoot:
artifacts
.
getArtifactPath
(
Artifact
.
flutterPatchedSdkPath
,
mode:
buildMode
),
sdkRoot:
artifacts
.
getArtifactPath
(
Artifact
.
flutterPatchedSdkPath
,
mode:
buildMode
),
...
@@ -101,10 +210,9 @@ class KernelSnapshot extends Target {
...
@@ -101,10 +210,9 @@ class KernelSnapshot extends Target {
targetModel:
TargetModel
.
flutter
,
targetModel:
TargetModel
.
flutter
,
targetProductVm:
buildMode
==
BuildMode
.
release
,
targetProductVm:
buildMode
==
BuildMode
.
release
,
outputFilePath:
environment
.
buildDir
.
childFile
(
'app.dill'
).
path
,
outputFilePath:
environment
.
buildDir
.
childFile
(
'app.dill'
).
path
,
depFilePath:
null
,
packagesPath:
packagesPath
,
packagesPath:
packagesPath
,
linkPlatformKernelIn:
buildMode
==
BuildMode
.
release
,
linkPlatformKernelIn:
buildMode
==
BuildMode
.
release
,
mainPath:
packageUriMapper
.
map
(
targetFile
)?.
toString
()
??
targetFil
e
,
mainPath:
targetFileAbsolut
e
,
);
);
if
(
output
.
errorCount
!=
0
)
{
if
(
output
.
errorCount
!=
0
)
{
throw
Exception
(
'Errors during snapshot creation:
$output
'
);
throw
Exception
(
'Errors during snapshot creation:
$output
'
);
...
...
packages/flutter_tools/lib/src/bundle.dart
View file @
84a476a4
...
@@ -11,7 +11,10 @@ import 'artifacts.dart';
...
@@ -11,7 +11,10 @@ import 'artifacts.dart';
import
'asset.dart'
;
import
'asset.dart'
;
import
'base/common.dart'
;
import
'base/common.dart'
;
import
'base/file_system.dart'
;
import
'base/file_system.dart'
;
import
'base/platform.dart'
;
import
'build_info.dart'
;
import
'build_info.dart'
;
import
'build_system/build_system.dart'
;
import
'build_system/targets/dart.dart'
;
import
'compile.dart'
;
import
'compile.dart'
;
import
'dart/package_map.dart'
;
import
'dart/package_map.dart'
;
import
'devfs.dart'
;
import
'devfs.dart'
;
...
@@ -69,6 +72,7 @@ class BundleBuilder {
...
@@ -69,6 +72,7 @@ class BundleBuilder {
List
<
String
>
extraGenSnapshotOptions
=
const
<
String
>[],
List
<
String
>
extraGenSnapshotOptions
=
const
<
String
>[],
List
<
String
>
fileSystemRoots
,
List
<
String
>
fileSystemRoots
,
String
fileSystemScheme
,
String
fileSystemScheme
,
bool
shouldBuildWithAssemble
=
false
,
})
async
{
})
async
{
mainPath
??=
defaultMainPath
;
mainPath
??=
defaultMainPath
;
depfilePath
??=
defaultDepfilePath
;
depfilePath
??=
defaultDepfilePath
;
...
@@ -77,6 +81,18 @@ class BundleBuilder {
...
@@ -77,6 +81,18 @@ class BundleBuilder {
applicationKernelFilePath
??=
getDefaultApplicationKernelPath
(
trackWidgetCreation:
trackWidgetCreation
);
applicationKernelFilePath
??=
getDefaultApplicationKernelPath
(
trackWidgetCreation:
trackWidgetCreation
);
final
FlutterProject
flutterProject
=
FlutterProject
.
current
();
final
FlutterProject
flutterProject
=
FlutterProject
.
current
();
if
(
shouldBuildWithAssemble
)
{
await
buildWithAssemble
(
buildMode:
buildMode
??
BuildMode
.
debug
,
targetPlatform:
platform
,
mainPath:
mainPath
,
flutterProject:
flutterProject
,
outputDir:
assetDirPath
,
depfilePath:
depfilePath
,
);
return
;
}
DevFSContent
kernelContent
;
DevFSContent
kernelContent
;
if
(!
precompiledSnapshot
)
{
if
(!
precompiledSnapshot
)
{
if
((
extraFrontEndOptions
!=
null
)
&&
extraFrontEndOptions
.
isNotEmpty
)
{
if
((
extraFrontEndOptions
!=
null
)
&&
extraFrontEndOptions
.
isNotEmpty
)
{
...
@@ -124,6 +140,66 @@ class BundleBuilder {
...
@@ -124,6 +140,66 @@ class BundleBuilder {
}
}
}
}
/// Build an application bundle using flutter assemble.
///
/// This is a temporary shim to migrate the build implementations.
Future
<
void
>
buildWithAssemble
({
@required
FlutterProject
flutterProject
,
@required
BuildMode
buildMode
,
@required
TargetPlatform
targetPlatform
,
@required
String
mainPath
,
@required
String
outputDir
,
@required
String
depfilePath
,
})
async
{
final
Environment
environment
=
Environment
(
projectDir:
flutterProject
.
directory
,
outputDir:
fs
.
directory
(
outputDir
),
buildDir:
flutterProject
.
dartTool
.
childDirectory
(
'flutter_build'
),
defines:
<
String
,
String
>{
kTargetFile:
mainPath
,
kBuildMode:
getNameForBuildMode
(
buildMode
),
kTargetPlatform:
getNameForTargetPlatform
(
targetPlatform
),
}
);
final
Target
target
=
buildMode
==
BuildMode
.
debug
?
const
CopyFlutterBundle
()
:
const
ReleaseCopyFlutterBundle
();
final
BuildResult
result
=
await
buildSystem
.
build
(
target
,
environment
);
if
(!
result
.
success
)
{
for
(
ExceptionMeasurement
measurement
in
result
.
exceptions
.
values
)
{
printError
(
measurement
.
exception
.
toString
());
printError
(
measurement
.
stackTrace
.
toString
());
}
throwToolExit
(
'Failed to build bundle.'
);
}
// Output depfile format:
final
StringBuffer
buffer
=
StringBuffer
();
buffer
.
write
(
'flutter_bundle'
);
_writeFilesToBuffer
(
result
.
outputFiles
,
buffer
);
buffer
.
write
(
': '
);
_writeFilesToBuffer
(
result
.
inputFiles
,
buffer
);
final
File
depfile
=
fs
.
file
(
depfilePath
);
if
(!
depfile
.
parent
.
existsSync
())
{
depfile
.
parent
.
createSync
(
recursive:
true
);
}
depfile
.
writeAsStringSync
(
buffer
.
toString
());
}
void
_writeFilesToBuffer
(
List
<
File
>
files
,
StringBuffer
buffer
)
{
for
(
File
outputFile
in
files
)
{
if
(
platform
.
isWindows
)
{
// Paths in a depfile have to be escaped on windows.
final
String
escapedPath
=
outputFile
.
path
.
replaceAll
(
r'\'
,
r'\\'
);
buffer
.
write
(
'
$escapedPath
'
);
}
else
{
buffer
.
write
(
'
${outputFile.path}
'
);
}
}
}
Future
<
AssetBundle
>
buildAssets
({
Future
<
AssetBundle
>
buildAssets
({
String
manifestPath
,
String
manifestPath
,
String
assetDirPath
,
String
assetDirPath
,
...
...
packages/flutter_tools/lib/src/codegen.dart
View file @
84a476a4
...
@@ -84,8 +84,6 @@ abstract class CodegenDaemon {
...
@@ -84,8 +84,6 @@ abstract class CodegenDaemon {
/// Only a subset of the arguments provided to the [KernelCompiler] are
/// Only a subset of the arguments provided to the [KernelCompiler] are
/// supported here. Using the build pipeline implies a fixed multiroot
/// supported here. Using the build pipeline implies a fixed multiroot
/// filesystem and requires a pubspec.
/// filesystem and requires a pubspec.
///
/// This is only safe to use if [experimentalBuildEnabled] is true.
class
CodeGeneratingKernelCompiler
implements
KernelCompiler
{
class
CodeGeneratingKernelCompiler
implements
KernelCompiler
{
const
CodeGeneratingKernelCompiler
();
const
CodeGeneratingKernelCompiler
();
...
...
packages/flutter_tools/lib/src/commands/assemble.dart
View file @
84a476a4
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
import
'package:meta/meta.dart'
;
import
'package:meta/meta.dart'
;
import
'../base/common.dart'
;
import
'../base/common.dart'
;
import
'../base/context.dart'
;
import
'../base/file_system.dart'
;
import
'../base/file_system.dart'
;
import
'../build_system/build_system.dart'
;
import
'../build_system/build_system.dart'
;
import
'../build_system/targets/assets.dart'
;
import
'../build_system/targets/assets.dart'
;
...
@@ -18,9 +17,6 @@ import '../globals.dart';
...
@@ -18,9 +17,6 @@ import '../globals.dart';
import
'../project.dart'
;
import
'../project.dart'
;
import
'../runner/flutter_command.dart'
;
import
'../runner/flutter_command.dart'
;
/// The [BuildSystem] instance.
BuildSystem
get
buildSystem
=>
context
.
get
<
BuildSystem
>();
/// All currently implemented targets.
/// All currently implemented targets.
const
List
<
Target
>
_kDefaultTargets
=
<
Target
>[
const
List
<
Target
>
_kDefaultTargets
=
<
Target
>[
UnpackLinux
(),
UnpackLinux
(),
...
...
packages/flutter_tools/lib/src/commands/build_bundle.dart
View file @
84a476a4
...
@@ -131,6 +131,7 @@ class BuildBundleCommand extends BuildSubCommand {
...
@@ -131,6 +131,7 @@ class BuildBundleCommand extends BuildSubCommand {
extraGenSnapshotOptions:
argResults
[
FlutterOptions
.
kExtraGenSnapshotOptions
],
extraGenSnapshotOptions:
argResults
[
FlutterOptions
.
kExtraGenSnapshotOptions
],
fileSystemScheme:
argResults
[
'filesystem-scheme'
],
fileSystemScheme:
argResults
[
'filesystem-scheme'
],
fileSystemRoots:
argResults
[
'filesystem-root'
],
fileSystemRoots:
argResults
[
'filesystem-root'
],
shouldBuildWithAssemble:
true
,
);
);
return
null
;
return
null
;
}
}
...
...
packages/flutter_tools/test/general.shard/build_system/build_system_test.dart
View file @
84a476a4
...
@@ -235,6 +235,31 @@ void main() {
...
@@ -235,6 +235,31 @@ void main() {
expect
(
environment
.
buildDir
.
childFile
(
'foo.out'
).
existsSync
(),
false
);
expect
(
environment
.
buildDir
.
childFile
(
'foo.out'
).
existsSync
(),
false
);
}));
}));
test
(
'Does not crash when filesytem and cache are out of sync'
,
()
=>
testbed
.
run
(()
async
{
final
TestTarget
testTarget
=
TestTarget
((
Environment
environment
)
async
{
environment
.
buildDir
.
childFile
(
'foo.out'
).
createSync
();
})
..
inputs
=
const
<
Source
>[
Source
.
pattern
(
'{PROJECT_DIR}/foo.dart'
)]
..
outputs
=
const
<
Source
>[
Source
.
pattern
(
'{BUILD_DIR}/foo.out'
)];
fs
.
file
(
'foo.dart'
).
createSync
();
await
buildSystem
.
build
(
testTarget
,
environment
);
expect
(
environment
.
buildDir
.
childFile
(
'foo.out'
).
existsSync
(),
true
);
environment
.
buildDir
.
childFile
(
'foo.out'
).
deleteSync
();
final
TestTarget
testTarget2
=
TestTarget
((
Environment
environment
)
async
{
environment
.
buildDir
.
childFile
(
'bar.out'
).
createSync
();
})
..
inputs
=
const
<
Source
>[
Source
.
pattern
(
'{PROJECT_DIR}/foo.dart'
)]
..
outputs
=
const
<
Source
>[
Source
.
pattern
(
'{BUILD_DIR}/bar.out'
)];
await
buildSystem
.
build
(
testTarget2
,
environment
);
expect
(
environment
.
buildDir
.
childFile
(
'bar.out'
).
existsSync
(),
true
);
expect
(
environment
.
buildDir
.
childFile
(
'foo.out'
).
existsSync
(),
false
);
}));
test
(
'reruns build if stamp is corrupted'
,
()
=>
testbed
.
run
(()
async
{
test
(
'reruns build if stamp is corrupted'
,
()
=>
testbed
.
run
(()
async
{
final
TestTarget
testTarget
=
TestTarget
((
Environment
envionment
)
async
{
final
TestTarget
testTarget
=
TestTarget
((
Environment
envionment
)
async
{
environment
.
buildDir
.
childFile
(
'foo.out'
).
createSync
();
environment
.
buildDir
.
childFile
(
'foo.out'
).
createSync
();
...
...
packages/flutter_tools/test/general.shard/build_system/filecache_test.dart
View file @
84a476a4
...
@@ -68,4 +68,17 @@ void main() {
...
@@ -68,4 +68,17 @@ void main() {
expect
(
fileStorage
.
files
.
single
.
hash
,
currentHash
);
expect
(
fileStorage
.
files
.
single
.
hash
,
currentHash
);
expect
(
fileStorage
.
files
.
single
.
path
,
file
.
resolveSymbolicLinksSync
());
expect
(
fileStorage
.
files
.
single
.
path
,
file
.
resolveSymbolicLinksSync
());
}));
}));
test
(
'handles persisting with a missing build directory'
,
()
=>
testbed
.
run
(()
{
final
File
file
=
fs
.
file
(
'foo.dart'
)
..
createSync
()
..
writeAsStringSync
(
'hello'
);
final
FileHashStore
fileCache
=
FileHashStore
(
environment
);
fileCache
.
initialize
();
environment
.
buildDir
.
deleteSync
(
recursive:
true
);
fileCache
.
hashFiles
(<
File
>[
file
]);
// Does not throw.
fileCache
.
persist
();
}));
}
}
packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
View file @
84a476a4
...
@@ -81,6 +81,7 @@ flutter_tools:lib/''');
...
@@ -81,6 +81,7 @@ flutter_tools:lib/''');
fs
.
path
.
join
(
'bin'
,
'cache'
,
'pkg'
,
'sky_engine'
,
'sdk_ext'
,
fs
.
path
.
join
(
'bin'
,
'cache'
,
'pkg'
,
'sky_engine'
,
'sdk_ext'
,
'vmservice_io.dart'
),
'vmservice_io.dart'
),
fs
.
path
.
join
(
'bin'
,
'cache'
,
'dart-sdk'
,
'bin'
,
'dart'
),
fs
.
path
.
join
(
'bin'
,
'cache'
,
'dart-sdk'
,
'bin'
,
'dart'
),
fs
.
path
.
join
(
'bin'
,
'cache'
,
'dart-sdk'
,
'bin'
,
'dart.exe'
),
fs
.
path
.
join
(
engineArtifacts
,
getNameForHostPlatform
(
hostPlatform
),
fs
.
path
.
join
(
engineArtifacts
,
getNameForHostPlatform
(
hostPlatform
),
'frontend_server.dart.snapshot'
),
'frontend_server.dart.snapshot'
),
fs
.
path
.
join
(
engineArtifacts
,
'android-arm-profile'
,
fs
.
path
.
join
(
engineArtifacts
,
'android-arm-profile'
,
...
...
packages/flutter_tools/test/general.shard/bundle_shim_test.dart
0 → 100644
View file @
84a476a4
// Copyright 2019 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:flutter_tools/src/base/common.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
import
'package:flutter_tools/src/build_info.dart'
;
import
'package:flutter_tools/src/build_system/build_system.dart'
;
import
'package:flutter_tools/src/bundle.dart'
;
import
'package:flutter_tools/src/project.dart'
;
import
'package:mockito/mockito.dart'
;
import
'../src/common.dart'
;
import
'../src/testbed.dart'
;
// Tests for the temporary flutter assemble/bundle shim.
void
main
(
)
{
Testbed
testbed
;
setUp
(()
{
testbed
=
Testbed
(
overrides:
<
Type
,
Generator
>{
BuildSystem:
()
=>
MockBuildSystem
(),
});
});
test
(
'Copies assets to expected directory after building'
,
()
=>
testbed
.
run
(()
async
{
when
(
buildSystem
.
build
(
any
,
any
)).
thenAnswer
((
Invocation
invocation
)
async
{
final
Environment
environment
=
invocation
.
positionalArguments
[
1
];
environment
.
outputDir
.
childFile
(
'kernel_blob.bin'
).
createSync
(
recursive:
true
);
environment
.
outputDir
.
childFile
(
'isolate_snapshot_data'
).
createSync
();
environment
.
outputDir
.
childFile
(
'vm_snapshot_data'
).
createSync
();
environment
.
outputDir
.
childFile
(
'LICENSE'
).
createSync
(
recursive:
true
);
return
BuildResult
(
success:
true
);
});
await
buildWithAssemble
(
buildMode:
BuildMode
.
debug
,
flutterProject:
FlutterProject
.
current
(),
mainPath:
fs
.
path
.
join
(
'lib'
,
'main.dart'
),
outputDir:
'example'
,
targetPlatform:
TargetPlatform
.
ios
,
depfilePath:
'example.d'
,
);
expect
(
fs
.
file
(
fs
.
path
.
join
(
'example'
,
'kernel_blob.bin'
)).
existsSync
(),
true
);
expect
(
fs
.
file
(
fs
.
path
.
join
(
'example'
,
'LICENSE'
)).
existsSync
(),
true
);
expect
(
fs
.
file
(
fs
.
path
.
join
(
'example.d'
)).
existsSync
(),
true
);
}));
test
(
'Handles build system failure'
,
()
=>
testbed
.
run
(()
{
when
(
buildSystem
.
build
(
any
,
any
)).
thenAnswer
((
Invocation
_
)
async
{
return
BuildResult
(
success:
false
,
exceptions:
<
String
,
ExceptionMeasurement
>{},
);
});
expect
(()
=>
buildWithAssemble
(
buildMode:
BuildMode
.
debug
,
flutterProject:
FlutterProject
.
current
(),
mainPath:
'lib/main.dart'
,
outputDir:
'example'
,
targetPlatform:
TargetPlatform
.
linux_x64
,
depfilePath:
'example.d'
,
),
throwsA
(
isInstanceOf
<
ToolExit
>()));
}));
}
class
MockBuildSystem
extends
Mock
implements
BuildSystem
{}
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