github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we find dart.exe on local engines (#41514)

Browse Source
This commit is contained in:
Jonah Williams 2019-09-27 18:54:24 -07:00 committed by GitHub
parent 5f9c262e66
commit 7a487b2cbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/flutter_tools/lib/src/artifacts.dart
View File

@ -158,6 +158,19 @@ abstract class Artifacts {
String getEngineType(TargetPlatform platform, [ BuildMode mode ]); String getEngineType(TargetPlatform platform, [ BuildMode mode ]);
} }
TargetPlatform get _currentHostPlatform {
if (platform.isMacOS) {
return TargetPlatform.darwin_x64;
}
if (platform.isLinux) {
return TargetPlatform.linux_x64;
}
if (platform.isWindows) {
return TargetPlatform.windows_x64;
}
throw UnimplementedError('Host OS not supported.');
}
/// Manages the engine artifacts downloaded to the local cache. /// Manages the engine artifacts downloaded to the local cache.
class CachedArtifacts extends Artifacts { class CachedArtifacts extends Artifacts {
@ -337,19 +350,6 @@ class CachedArtifacts extends Artifacts {
assert(false, 'Invalid platform $platform.'); assert(false, 'Invalid platform $platform.');
return null; return null;
} }
TargetPlatform get _currentHostPlatform {
if (platform.isMacOS) {
return TargetPlatform.darwin_x64;
}
if (platform.isLinux) {
return TargetPlatform.linux_x64;
}
if (platform.isWindows) {
return TargetPlatform.windows_x64;
}
throw UnimplementedError('Host OS not supported.');
}
} }
/// Manages the artifacts of a locally built engine. /// Manages the artifacts of a locally built engine.
@ -362,7 +362,8 @@ class LocalEngineArtifacts extends Artifacts {
@override @override
String getArtifactPath(Artifact artifact, { TargetPlatform platform, BuildMode mode }) { String getArtifactPath(Artifact artifact, { TargetPlatform platform, BuildMode mode }) {
final String artifactFileName = _artifactToFileName(artifact); platform ??= _currentHostPlatform;
final String artifactFileName = _artifactToFileName(artifact, platform);
switch (artifact) { switch (artifact) {
case Artifact.snapshotDart: case Artifact.snapshotDart:
return fs.path.join(_engineSrcPath, 'flutter', 'lib', 'snapshot', artifactFileName); return fs.path.join(_engineSrcPath, 'flutter', 'lib', 'snapshot', artifactFileName);

14
packages/flutter_tools/test/general.shard/artifacts_test.dart
View File

@ -113,6 +113,20 @@ void main() {
FileSystem: () => memoryFileSystem, FileSystem: () => memoryFileSystem,
Platform: () => FakePlatform(operatingSystem: 'linux'), Platform: () => FakePlatform(operatingSystem: 'linux'),
}); });
testUsingContext('Looks up dart.exe on windows platforms', () async {
expect(artifacts.getArtifactPath(Artifact.engineDartBinary), contains('.exe'));
}, overrides: <Type, Generator>{
FileSystem: () => memoryFileSystem,
Platform: () => FakePlatform(operatingSystem: 'windows'),
});
testUsingContext('Looks up dart on linux platforms', () async {
expect(artifacts.getArtifactPath(Artifact.engineDartBinary), isNot(contains('.exe')));
}, overrides: <Type, Generator>{
FileSystem: () => memoryFileSystem,
Platform: () => FakePlatform(operatingSystem: 'linux'),
});
}); });
}); });
} }