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
602f76ca
Unverified
Commit
602f76ca
authored
Aug 01, 2019
by
Jonah Williams
Committed by
GitHub
Aug 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix errors caught by roll of macOS assemble (#37351)
parent
e1746161
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
7 deletions
+22
-7
macos_build_flutter_assets.sh
packages/flutter_tools/bin/macos_build_flutter_assets.sh
+8
-0
dart.dart
...ages/flutter_tools/lib/src/build_system/targets/dart.dart
+3
-0
macos.dart
...ges/flutter_tools/lib/src/build_system/targets/macos.dart
+0
-3
macos_device.dart
packages/flutter_tools/lib/src/macos/macos_device.dart
+1
-1
dart_test.dart
...ls/test/general.shard/build_system/targets/dart_test.dart
+10
-0
macos_test.dart
...s/test/general.shard/build_system/targets/macos_test.dart
+0
-3
No files found.
packages/flutter_tools/bin/macos_build_flutter_assets.sh
View file @
602f76ca
...
@@ -74,6 +74,14 @@ esac
...
@@ -74,6 +74,14 @@ esac
build_inputs_path
=
"
${
SOURCE_ROOT
}
/Flutter/ephemeral/FlutterInputs.xcfilelist"
build_inputs_path
=
"
${
SOURCE_ROOT
}
/Flutter/ephemeral/FlutterInputs.xcfilelist"
build_outputs_path
=
"
${
SOURCE_ROOT
}
/Flutter/ephemeral/FlutterOutputs.xcfilelist"
build_outputs_path
=
"
${
SOURCE_ROOT
}
/Flutter/ephemeral/FlutterOutputs.xcfilelist"
# Precache artifacts
RunCommand
"
${
FLUTTER_ROOT
}
/bin/flutter"
--suppress-analytics
\
${
verbose_flag
}
\
precache
\
--no-android
\
--no-ios
\
--macos
\
# TODO(jonahwilliams): support flavors https://github.com/flutter/flutter/issues/32923
# TODO(jonahwilliams): support flavors https://github.com/flutter/flutter/issues/32923
RunCommand
"
${
FLUTTER_ROOT
}
/bin/flutter"
--suppress-analytics
\
RunCommand
"
${
FLUTTER_ROOT
}
/bin/flutter"
--suppress-analytics
\
${
verbose_flag
}
\
${
verbose_flag
}
\
...
...
packages/flutter_tools/lib/src/build_system/targets/dart.dart
View file @
602f76ca
...
@@ -43,6 +43,9 @@ List<File> listDartSources(Environment environment) {
...
@@ -43,6 +43,9 @@ List<File> listDartSources(Environment environment) {
final
List
<
File
>
dartFiles
=
<
File
>[];
final
List
<
File
>
dartFiles
=
<
File
>[];
for
(
Uri
uri
in
packageMap
.
values
)
{
for
(
Uri
uri
in
packageMap
.
values
)
{
final
Directory
libDirectory
=
fs
.
directory
(
uri
.
toFilePath
(
windows:
platform
.
isWindows
));
final
Directory
libDirectory
=
fs
.
directory
(
uri
.
toFilePath
(
windows:
platform
.
isWindows
));
if
(!
libDirectory
.
existsSync
())
{
continue
;
}
for
(
FileSystemEntity
entity
in
libDirectory
.
listSync
(
recursive:
true
))
{
for
(
FileSystemEntity
entity
in
libDirectory
.
listSync
(
recursive:
true
))
{
if
(
entity
is
File
&&
entity
.
path
.
endsWith
(
'.dart'
))
{
if
(
entity
is
File
&&
entity
.
path
.
endsWith
(
'.dart'
))
{
dartFiles
.
add
(
entity
);
dartFiles
.
add
(
entity
);
...
...
packages/flutter_tools/lib/src/build_system/targets/macos.dart
View file @
602f76ca
...
@@ -41,9 +41,6 @@ class UnpackMacOS extends Target {
...
@@ -41,9 +41,6 @@ class UnpackMacOS extends Target {
List
<
Source
>
get
outputs
=>
const
<
Source
>[
List
<
Source
>
get
outputs
=>
const
<
Source
>[
Source
.
pattern
(
'
$_kOutputPrefix
/FlutterMacOS'
),
Source
.
pattern
(
'
$_kOutputPrefix
/FlutterMacOS'
),
// Headers
// Headers
Source
.
pattern
(
'
$_kOutputPrefix
/Headers/FLEOpenGLContextHandling.h'
),
Source
.
pattern
(
'
$_kOutputPrefix
/Headers/FLEReshapeListener.h'
),
Source
.
pattern
(
'
$_kOutputPrefix
/Headers/FLEView.h'
),
Source
.
pattern
(
'
$_kOutputPrefix
/Headers/FLEViewController.h'
),
Source
.
pattern
(
'
$_kOutputPrefix
/Headers/FLEViewController.h'
),
Source
.
pattern
(
'
$_kOutputPrefix
/Headers/FlutterBinaryMessenger.h'
),
Source
.
pattern
(
'
$_kOutputPrefix
/Headers/FlutterBinaryMessenger.h'
),
Source
.
pattern
(
'
$_kOutputPrefix
/Headers/FlutterChannels.h'
),
Source
.
pattern
(
'
$_kOutputPrefix
/Headers/FlutterChannels.h'
),
...
...
packages/flutter_tools/lib/src/macos/macos_device.dart
View file @
602f76ca
...
@@ -100,7 +100,7 @@ class MacOSDevice extends Device {
...
@@ -100,7 +100,7 @@ class MacOSDevice extends Device {
}
}
// Make sure to call stop app after we've built.
// Make sure to call stop app after we've built.
await
stopApp
(
p
ackage
);
await
stopApp
(
p
rebuiltMacOSApp
);
final
Process
process
=
await
processManager
.
start
(<
String
>[
final
Process
process
=
await
processManager
.
start
(<
String
>[
prebuiltMacOSApp
.
executable
,
prebuiltMacOSApp
.
executable
,
]);
]);
...
...
packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
View file @
602f76ca
...
@@ -251,6 +251,16 @@ flutter_tools:lib/''');
...
@@ -251,6 +251,16 @@ flutter_tools:lib/''');
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
ProcessManager:
()
=>
mockProcessManager
,
ProcessManager:
()
=>
mockProcessManager
,
}));
}));
test
(
'list dart sources handles packages without lib directories'
,
()
=>
testbed
.
run
(()
{
fs
.
file
(
'.packages'
)
..
createSync
()
..
writeAsStringSync
(
'''
# Generated
example:fiz/lib/'''
);
fs
.
directory
(
'fiz'
).
createSync
();
expect
(
listDartSources
(
androidEnvironment
),
<
File
>[]);
}));
}
}
class
MockProcessManager
extends
Mock
implements
ProcessManager
{}
class
MockProcessManager
extends
Mock
implements
ProcessManager
{}
...
...
packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart
View file @
602f76ca
...
@@ -86,9 +86,6 @@ void main() {
...
@@ -86,9 +86,6 @@ void main() {
expect
(
fs
.
directory
(
'macos/Flutter/ephemeral/FlutterMacOS.framework'
).
existsSync
(),
true
);
expect
(
fs
.
directory
(
'macos/Flutter/ephemeral/FlutterMacOS.framework'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/FlutterMacOS'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/FlutterMacOS'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/Headers/FLEOpenGLContextHandling.h'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/Headers/FLEReshapeListener.h'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/Headers/FLEView.h'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/Headers/FLEViewController.h'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/Headers/FLEViewController.h'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/Headers/FlutterBinaryMessenger.h'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/Headers/FlutterBinaryMessenger.h'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/Headers/FlutterChannels.h'
).
existsSync
(),
true
);
expect
(
fs
.
file
(
'macos/Flutter/ephemeral/FlutterMacOS.framework/Headers/FlutterChannels.h'
).
existsSync
(),
true
);
...
...
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