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
a3b9e20a
Unverified
Commit
a3b9e20a
authored
Jun 01, 2020
by
stuartmorgan
Committed by
GitHub
Jun 01, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix non-local-engine Linux release builds (#58372)
parent
1d395c5e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
2 deletions
+26
-2
linux.dart
...ges/flutter_tools/lib/src/build_system/targets/linux.dart
+4
-2
cache.dart
packages/flutter_tools/lib/src/cache.dart
+4
-0
linux_test.dart
...s/test/general.shard/build_system/targets/linux_test.dart
+5
-0
cache_test.dart
packages/flutter_tools/test/general.shard/cache_test.dart
+13
-0
No files found.
packages/flutter_tools/lib/src/build_system/targets/linux.dart
View file @
a3b9e20a
...
@@ -23,8 +23,6 @@ const List<String> _kLinuxArtifacts = <String>[
...
@@ -23,8 +23,6 @@ const List<String> _kLinuxArtifacts = <String>[
'flutter_glfw.h'
,
'flutter_glfw.h'
,
// GTK. Not yet used by the template.
// GTK. Not yet used by the template.
'libflutter_linux_gtk.so'
,
'libflutter_linux_gtk.so'
,
// Shared.
'icudtl.dat'
,
];
];
const
String
_kLinuxDepfile
=
'linux_engine_sources.d'
;
const
String
_kLinuxDepfile
=
'linux_engine_sources.d'
;
...
@@ -86,6 +84,10 @@ class UnpackLinux extends Target {
...
@@ -86,6 +84,10 @@ class UnpackLinux extends Target {
outputDirectory:
outputDirectory
,
outputDirectory:
outputDirectory
,
artifacts:
_kLinuxArtifacts
,
artifacts:
_kLinuxArtifacts
,
clientSourcePaths:
<
String
>[
clientSourcePath
,
headersPath
],
clientSourcePaths:
<
String
>[
clientSourcePath
,
headersPath
],
icuDataPath:
environment
.
artifacts
.
getArtifactPath
(
Artifact
.
icuData
,
platform:
TargetPlatform
.
linux_x64
,
)
);
);
final
DepfileService
depfileService
=
DepfileService
(
final
DepfileService
depfileService
=
DepfileService
(
fileSystem:
environment
.
fileSystem
,
fileSystem:
environment
.
fileSystem
,
...
...
packages/flutter_tools/lib/src/cache.dart
View file @
a3b9e20a
...
@@ -1392,7 +1392,11 @@ const List<List<String>> _windowsDesktopBinaryDirs = <List<String>>[
...
@@ -1392,7 +1392,11 @@ const List<List<String>> _windowsDesktopBinaryDirs = <List<String>>[
const
List
<
List
<
String
>>
_linuxDesktopBinaryDirs
=
<
List
<
String
>>[
const
List
<
List
<
String
>>
_linuxDesktopBinaryDirs
=
<
List
<
String
>>[
<
String
>[
'linux-x64'
,
'linux-x64/linux-x64-flutter-glfw.zip'
],
<
String
>[
'linux-x64'
,
'linux-x64/linux-x64-flutter-glfw.zip'
],
<
String
>[
'linux-x64'
,
'linux-x64/flutter-cpp-client-wrapper-glfw.zip'
],
<
String
>[
'linux-x64'
,
'linux-x64/flutter-cpp-client-wrapper-glfw.zip'
],
<
String
>[
'linux-x64-profile'
,
'linux-x64-profile/linux-x64-flutter-glfw.zip'
],
<
String
>[
'linux-x64-release'
,
'linux-x64-release/linux-x64-flutter-glfw.zip'
],
<
String
>[
'linux-x64'
,
'linux-x64/linux-x64-flutter-gtk.zip'
],
<
String
>[
'linux-x64'
,
'linux-x64/linux-x64-flutter-gtk.zip'
],
<
String
>[
'linux-x64-profile'
,
'linux-x64-profile/linux-x64-flutter-gtk.zip'
],
<
String
>[
'linux-x64-release'
,
'linux-x64-release/linux-x64-flutter-gtk.zip'
],
];
];
const
List
<
List
<
String
>>
_macOSDesktopBinaryDirs
=
<
List
<
String
>>[
const
List
<
List
<
String
>>
_macOSDesktopBinaryDirs
=
<
List
<
String
>>[
...
...
packages/flutter_tools/test/general.shard/build_system/targets/linux_test.dart
View file @
a3b9e20a
...
@@ -36,6 +36,11 @@ void main() {
...
@@ -36,6 +36,11 @@ void main() {
mode:
anyNamed
(
'mode'
),
mode:
anyNamed
(
'mode'
),
platform:
anyNamed
(
'platform'
),
platform:
anyNamed
(
'platform'
),
)).
thenReturn
(
'linux-x64/flutter_linux'
);
)).
thenReturn
(
'linux-x64/flutter_linux'
);
when
(
mockArtifacts
.
getArtifactPath
(
Artifact
.
icuData
,
mode:
anyNamed
(
'mode'
),
platform:
anyNamed
(
'platform'
),
)).
thenReturn
(
r'linux-x64/icudtl.dat'
);
final
Environment
testEnvironment
=
Environment
.
test
(
final
Environment
testEnvironment
=
Environment
.
test
(
fileSystem
.
currentDirectory
,
fileSystem
.
currentDirectory
,
...
...
packages/flutter_tools/test/general.shard/cache_test.dart
View file @
a3b9e20a
...
@@ -611,6 +611,19 @@ void main() {
...
@@ -611,6 +611,19 @@ void main() {
expect
(
artifacts
.
getBinaryDirs
(),
isNotEmpty
);
expect
(
artifacts
.
getBinaryDirs
(),
isNotEmpty
);
});
});
testWithoutContext
(
'Linux desktop artifacts include profile and release artifacts'
,
()
{
final
MockCache
mockCache
=
MockCache
();
final
LinuxEngineArtifacts
artifacts
=
LinuxEngineArtifacts
(
mockCache
,
platform:
FakePlatform
(
operatingSystem:
'linux'
),
);
expect
(
artifacts
.
getBinaryDirs
(),
containsAll
(<
Matcher
>[
contains
(
contains
(
'profile'
)),
contains
(
contains
(
'release'
)),
]));
});
}
}
class
FakeCachedArtifact
extends
EngineCachedArtifact
{
class
FakeCachedArtifact
extends
EngineCachedArtifact
{
...
...
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