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
2d47481f
Unverified
Commit
2d47481f
authored
Feb 12, 2018
by
Mikkel Nygaard Ravn
Committed by
GitHub
Feb 12, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Reduce xcodebuild noise #2" (#14641)
Merging to get back to a green tree.
parent
ce82cc65
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
41 deletions
+13
-41
xcode_backend.sh
packages/flutter_tools/bin/xcode_backend.sh
+1
-3
mac.dart
packages/flutter_tools/lib/src/ios/mac.dart
+12
-38
No files found.
packages/flutter_tools/bin/xcode_backend.sh
View file @
2d47481f
...
@@ -4,9 +4,7 @@
...
@@ -4,9 +4,7 @@
# found in the LICENSE file.
# found in the LICENSE file.
RunCommand
()
{
RunCommand
()
{
if
[[
-n
"
$VERBOSE_SCRIPT_LOGGING
"
]]
;
then
echo
"♦
$*
"
echo
"♦
$*
"
fi
"
$@
"
"
$@
"
return
$?
return
$?
}
}
...
...
packages/flutter_tools/lib/src/ios/mac.dart
View file @
2d47481f
...
@@ -277,41 +277,16 @@ Future<XcodeBuildResult> buildXcodeProject({
...
@@ -277,41 +277,16 @@ Future<XcodeBuildResult> buildXcodeProject({
);
);
}
}
final
Status
cleanStatus
=
logger
.
startProgress
(
'Running Xcode clean...'
,
expectSlowOperation:
true
);
final
RunResult
cleanResult
=
await
runAsync
(
<
String
>[
'/usr/bin/env'
,
'xcrun'
,
'xcodebuild'
,
'clean'
,
'-configuration'
,
configuration
,
],
workingDirectory:
app
.
appDirectory
,
);
cleanStatus
.
stop
();
if
(
cleanResult
.
exitCode
!=
0
)
{
throwToolExit
(
'Xcode failed to clean
\n
${cleanResult.stderr}
'
);
}
final
List
<
String
>
commands
=
<
String
>[
final
List
<
String
>
commands
=
<
String
>[
'/usr/bin/env'
,
'/usr/bin/env'
,
'xcrun'
,
'xcrun'
,
'xcodebuild'
,
'xcodebuild'
,
'clean'
,
'build'
,
'build'
,
'-configuration'
,
configuration
,
'-configuration'
,
configuration
,
'ONLY_ACTIVE_ARCH=YES'
,
'ONLY_ACTIVE_ARCH=YES'
,
];
];
if
(
logger
.
isVerbose
)
{
// An environment variable to be passed to xcode_backend.sh determining
// whether to echo back executed commands.
commands
.
add
(
'VERBOSE_SCRIPT_LOGGING=YES'
);
}
else
{
// This will print warnings and errors only.
commands
.
add
(
'-quiet'
);
}
if
(
developmentTeam
!=
null
)
if
(
developmentTeam
!=
null
)
commands
.
add
(
'DEVELOPMENT_TEAM=
$developmentTeam
'
);
commands
.
add
(
'DEVELOPMENT_TEAM=
$developmentTeam
'
);
...
@@ -343,28 +318,27 @@ Future<XcodeBuildResult> buildXcodeProject({
...
@@ -343,28 +318,27 @@ Future<XcodeBuildResult> buildXcodeProject({
);
);
}
}
final
Status
buildStatus
=
final
Status
status
=
logger
.
startProgress
(
'Running Xcode build...'
,
expectSlowOperation:
true
);
logger
.
startProgress
(
'Running Xcode build...'
,
expectSlowOperation:
true
);
final
RunResult
result
=
await
runAsync
(
final
RunResult
buildResult
=
await
runAsync
(
commands
,
commands
,
workingDirectory:
app
.
appDirectory
,
workingDirectory:
app
.
appDirectory
,
allowReentrantFlutter:
true
allowReentrantFlutter:
true
);
);
buildS
tatus
.
stop
();
s
tatus
.
stop
();
if
(
buildR
esult
.
exitCode
!=
0
)
{
if
(
r
esult
.
exitCode
!=
0
)
{
printStatus
(
'Failed to build iOS app'
);
printStatus
(
'Failed to build iOS app'
);
if
(
buildR
esult
.
stderr
.
isNotEmpty
)
{
if
(
r
esult
.
stderr
.
isNotEmpty
)
{
printStatus
(
'Error output from Xcode build:
\n
↳'
);
printStatus
(
'Error output from Xcode build:
\n
↳'
);
printStatus
(
buildR
esult
.
stderr
,
indent:
4
);
printStatus
(
r
esult
.
stderr
,
indent:
4
);
}
}
if
(
buildR
esult
.
stdout
.
isNotEmpty
)
{
if
(
r
esult
.
stdout
.
isNotEmpty
)
{
printStatus
(
'Xcode
\'
s output:
\n
↳'
);
printStatus
(
'Xcode
\'
s output:
\n
↳'
);
printStatus
(
buildR
esult
.
stdout
,
indent:
4
);
printStatus
(
r
esult
.
stdout
,
indent:
4
);
}
}
return
new
XcodeBuildResult
(
return
new
XcodeBuildResult
(
success:
false
,
success:
false
,
stdout:
buildR
esult
.
stdout
,
stdout:
r
esult
.
stdout
,
stderr:
buildR
esult
.
stderr
,
stderr:
r
esult
.
stderr
,
xcodeBuildExecution:
new
XcodeBuildExecution
(
xcodeBuildExecution:
new
XcodeBuildExecution
(
commands
,
commands
,
app
.
appDirectory
,
app
.
appDirectory
,
...
@@ -374,7 +348,7 @@ Future<XcodeBuildResult> buildXcodeProject({
...
@@ -374,7 +348,7 @@ Future<XcodeBuildResult> buildXcodeProject({
}
else
{
}
else
{
// Look for 'clean build/<configuration>-<sdk>/Runner.app'.
// Look for 'clean build/<configuration>-<sdk>/Runner.app'.
final
RegExp
regexp
=
new
RegExp
(
r' clean (.*\.app)$'
,
multiLine:
true
);
final
RegExp
regexp
=
new
RegExp
(
r' clean (.*\.app)$'
,
multiLine:
true
);
final
Match
match
=
regexp
.
firstMatch
(
buildR
esult
.
stdout
);
final
Match
match
=
regexp
.
firstMatch
(
r
esult
.
stdout
);
String
outputDir
;
String
outputDir
;
if
(
match
!=
null
)
{
if
(
match
!=
null
)
{
final
String
actualOutputDir
=
match
.
group
(
1
).
replaceAll
(
'
\\
'
,
' '
);
final
String
actualOutputDir
=
match
.
group
(
1
).
replaceAll
(
'
\\
'
,
' '
);
...
...
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