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
a2a4e9ed
Unverified
Commit
a2a4e9ed
authored
4 years ago
by
Jonah Williams
Committed by
GitHub
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Build App.framework directly to build directory (#69612)" (#69641)
This reverts commit
b7708831
.
parent
b7708831
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
19 deletions
+18
-19
xcode_backend.sh
packages/flutter_tools/bin/xcode_backend.sh
+13
-11
clean.dart
packages/flutter_tools/lib/src/commands/clean.dart
+1
-1
mac.dart
packages/flutter_tools/lib/src/ios/mac.dart
+1
-1
project.dart
packages/flutter_tools/lib/src/project.dart
+1
-4
clean_test.dart
...lutter_tools/test/commands.shard/hermetic/clean_test.dart
+2
-2
No files found.
packages/flutter_tools/bin/xcode_backend.sh
View file @
a2a4e9ed
...
@@ -179,7 +179,7 @@ is set to release or run \"flutter build ios --release\", then re-run Archive fr
...
@@ -179,7 +179,7 @@ is set to release or run \"flutter build ios --release\", then re-run Archive fr
${
flutter_engine_flag
}
\
${
flutter_engine_flag
}
\
${
local_engine_flag
}
\
${
local_engine_flag
}
\
assemble
\
assemble
\
--output
=
"
${
BUILT_PRODUCTS_DIR
}
/"
\
--output
=
"
${
derived_dir
}
/"
\
${
performance_measurement_option
}
\
${
performance_measurement_option
}
\
-dTargetPlatform
=
ios
\
-dTargetPlatform
=
ios
\
-dTargetFile
=
"
${
target_path
}
"
\
-dTargetFile
=
"
${
target_path
}
"
\
...
@@ -287,24 +287,26 @@ EmbedFlutterFrameworks() {
...
@@ -287,24 +287,26 @@ EmbedFlutterFrameworks() {
project_path
=
"
${
FLUTTER_APPLICATION_PATH
}
"
project_path
=
"
${
FLUTTER_APPLICATION_PATH
}
"
fi
fi
# Prefer the hidden .ios folder, but fallback to a visible ios folder if .ios
# doesn't exist.
local
flutter_ios_out_folder
=
"
${
project_path
}
/.ios/Flutter"
local
flutter_ios_engine_folder
=
"
${
project_path
}
/.ios/Flutter/engine"
if
[[
!
-d
${
flutter_ios_out_folder
}
]]
;
then
flutter_ios_out_folder
=
"
${
project_path
}
/ios/Flutter"
flutter_ios_engine_folder
=
"
${
project_path
}
/ios/Flutter"
fi
AssertExists
"
${
flutter_ios_out_folder
}
"
# Embed App.framework from Flutter into the app (after creating the Frameworks directory
# Embed App.framework from Flutter into the app (after creating the Frameworks directory
# if it doesn't already exist).
# if it doesn't already exist).
local
xcode_frameworks_dir
=
"
${
TARGET_BUILD_DIR
}
/
${
FRAMEWORKS_FOLDER_PATH
}
"
local
xcode_frameworks_dir
=
"
${
TARGET_BUILD_DIR
}
/
${
FRAMEWORKS_FOLDER_PATH
}
"
RunCommand
mkdir
-p
--
"
${
xcode_frameworks_dir
}
"
RunCommand
mkdir
-p
--
"
${
xcode_frameworks_dir
}
"
RunCommand rsync
-av
--delete
--filter
"- .DS_Store/"
"
${
BUILT_PRODUCTS_DIR
}
/App.framework"
"
${
xcode_frameworks_dir
}
"
RunCommand rsync
-av
--delete
"
${
flutter_ios_out_folder
}
/App.framework"
"
${
xcode_frameworks_dir
}
"
# Embed the actual Flutter.framework that the Flutter app expects to run against,
# Embed the actual Flutter.framework that the Flutter app expects to run against,
# which could be a local build or an arch/type specific build.
# which could be a local build or an arch/type specific build.
# Prefer the hidden .ios folder, but fallback to a visible ios folder if .ios
# doesn't exist.
local
flutter_ios_engine_folder
=
"
${
project_path
}
/.ios/Flutter/engine"
if
[[
!
-d
${
flutter_ios_engine_folder
}
]]
;
then
flutter_ios_engine_folder
=
"
${
project_path
}
/ios/Flutter"
fi
AssertExists
"
${
flutter_ios_engine_folder
}
"
# Copy Xcode behavior and don't copy over headers or modules.
# Copy Xcode behavior and don't copy over headers or modules.
RunCommand rsync
-av
--delete
--filter
"- .DS_Store/"
--filter
"- Headers/"
--filter
"- Modules/"
"
${
flutter_ios_engine_folder
}
/Flutter.framework"
"
${
xcode_frameworks_dir
}
/"
RunCommand rsync
-av
--delete
--filter
"- .DS_Store/"
--filter
"- Headers/"
--filter
"- Modules/"
"
${
flutter_ios_engine_folder
}
/Flutter.framework"
"
${
xcode_frameworks_dir
}
/"
if
[[
"
$ACTION
"
!=
"install"
||
"
$ENABLE_BITCODE
"
==
"NO"
]]
;
then
if
[[
"
$ACTION
"
!=
"install"
||
"
$ENABLE_BITCODE
"
==
"NO"
]]
;
then
...
...
This diff is collapsed.
Click to expand it.
packages/flutter_tools/lib/src/commands/clean.dart
View file @
a2a4e9ed
...
@@ -50,7 +50,7 @@ class CleanCommand extends FlutterCommand {
...
@@ -50,7 +50,7 @@ class CleanCommand extends FlutterCommand {
deleteFile
(
flutterProject
.
ios
.
ephemeralDirectory
);
deleteFile
(
flutterProject
.
ios
.
ephemeralDirectory
);
deleteFile
(
flutterProject
.
ios
.
generatedXcodePropertiesFile
);
deleteFile
(
flutterProject
.
ios
.
generatedXcodePropertiesFile
);
deleteFile
(
flutterProject
.
ios
.
generatedEnvironmentVariableExportScript
);
deleteFile
(
flutterProject
.
ios
.
generatedEnvironmentVariableExportScript
);
deleteFile
(
flutterProject
.
ios
.
deprecatedC
ompiledDartFramework
);
deleteFile
(
flutterProject
.
ios
.
c
ompiledDartFramework
);
deleteFile
(
flutterProject
.
linux
.
ephemeralDirectory
);
deleteFile
(
flutterProject
.
linux
.
ephemeralDirectory
);
deleteFile
(
flutterProject
.
macos
.
ephemeralDirectory
);
deleteFile
(
flutterProject
.
macos
.
ephemeralDirectory
);
...
...
This diff is collapsed.
Click to expand it.
packages/flutter_tools/lib/src/ios/mac.dart
View file @
a2a4e9ed
...
@@ -539,7 +539,7 @@ Future<void> diagnoseXcodeBuildFailure(XcodeBuildResult result, Usage flutterUsa
...
@@ -539,7 +539,7 @@ Future<void> diagnoseXcodeBuildFailure(XcodeBuildResult result, Usage flutterUsa
logger
.
printError
(
'Your Xcode project requires migration. See https://flutter.dev/docs/development/ios-project-migration for details.'
);
logger
.
printError
(
'Your Xcode project requires migration. See https://flutter.dev/docs/development/ios-project-migration for details.'
);
logger
.
printError
(
''
);
logger
.
printError
(
''
);
logger
.
printError
(
'You can temporarily work around this issue by running:'
);
logger
.
printError
(
'You can temporarily work around this issue by running:'
);
logger
.
printError
(
'
flutter clean
'
);
logger
.
printError
(
'
rm -rf ios/Flutter/App.framework
'
);
return
;
return
;
}
}
...
...
This diff is collapsed.
Click to expand it.
packages/flutter_tools/lib/src/project.dart
View file @
a2a4e9ed
...
@@ -682,10 +682,7 @@ class IosProject extends FlutterProjectPlatform implements XcodeBasedProject {
...
@@ -682,10 +682,7 @@ class IosProject extends FlutterProjectPlatform implements XcodeBasedProject {
.
childDirectory
(
'Flutter'
)
.
childDirectory
(
'Flutter'
)
.
childFile
(
'Generated.xcconfig'
);
.
childFile
(
'Generated.xcconfig'
);
/// No longer compiled to this location.
Directory
get
compiledDartFramework
=>
_flutterLibRoot
///
/// Used only for "flutter clean" to remove old references.
Directory
get
deprecatedCompiledDartFramework
=>
_flutterLibRoot
.
childDirectory
(
'Flutter'
)
.
childDirectory
(
'Flutter'
)
.
childDirectory
(
'App.framework'
);
.
childDirectory
(
'App.framework'
);
...
...
This diff is collapsed.
Click to expand it.
packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart
View file @
a2a4e9ed
...
@@ -48,7 +48,7 @@ void main() {
...
@@ -48,7 +48,7 @@ void main() {
projectUnderTest
.
ios
.
ephemeralDirectory
.
createSync
(
recursive:
true
);
projectUnderTest
.
ios
.
ephemeralDirectory
.
createSync
(
recursive:
true
);
projectUnderTest
.
ios
.
generatedXcodePropertiesFile
.
createSync
(
recursive:
true
);
projectUnderTest
.
ios
.
generatedXcodePropertiesFile
.
createSync
(
recursive:
true
);
projectUnderTest
.
ios
.
generatedEnvironmentVariableExportScript
.
createSync
(
recursive:
true
);
projectUnderTest
.
ios
.
generatedEnvironmentVariableExportScript
.
createSync
(
recursive:
true
);
projectUnderTest
.
ios
.
deprecatedC
ompiledDartFramework
.
createSync
(
recursive:
true
);
projectUnderTest
.
ios
.
c
ompiledDartFramework
.
createSync
(
recursive:
true
);
projectUnderTest
.
linux
.
ephemeralDirectory
.
createSync
(
recursive:
true
);
projectUnderTest
.
linux
.
ephemeralDirectory
.
createSync
(
recursive:
true
);
projectUnderTest
.
macos
.
ephemeralDirectory
.
createSync
(
recursive:
true
);
projectUnderTest
.
macos
.
ephemeralDirectory
.
createSync
(
recursive:
true
);
...
@@ -68,7 +68,7 @@ void main() {
...
@@ -68,7 +68,7 @@ void main() {
expect
(
projectUnderTest
.
ios
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
ios
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
ios
.
generatedXcodePropertiesFile
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
ios
.
generatedXcodePropertiesFile
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
ios
.
generatedEnvironmentVariableExportScript
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
ios
.
generatedEnvironmentVariableExportScript
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
ios
.
deprecatedC
ompiledDartFramework
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
ios
.
c
ompiledDartFramework
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
linux
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
linux
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
macos
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
expect
(
projectUnderTest
.
macos
.
ephemeralDirectory
.
existsSync
(),
isFalse
);
...
...
This diff is collapsed.
Click to expand it.
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