firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix variable check in xcode_backend.sh (#24368)

Browse Source 
* fix test in xcode_backend.sh

* -n

* fix devicelab test

* uncomment good code, check for \"\"
This commit is contained in:
Dan Field 2018-11-14 18:54:51 -08:00 committed by GitHub
parent 64a8d44764
commit 091b73ab6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/devicelab/bin/tasks/module_test_ios.dart
View File

@ -154,8 +154,8 @@ Future<void> main() async {
'Debug', 'Debug',
'CODE_SIGNING_ALLOWED=NO', 'CODE_SIGNING_ALLOWED=NO',
'CODE_SIGNING_REQUIRED=NO', 'CODE_SIGNING_REQUIRED=NO',
'CODE_SIGNING_IDENTITY=""', 'CODE_SIGN_IDENTITY=',
'EXPANDED_CODE_SIGN_IDENTITY=""', 'EXPANDED_CODE_SIGN_IDENTITY=',
'CONFIGURATION_BUILD_DIR=${tempDir.path}', 'CONFIGURATION_BUILD_DIR=${tempDir.path}',
], ],
); );

12
packages/flutter_tools/bin/xcode_backend.sh
View File

@ -55,7 +55,7 @@ BuildApp() {
release*) build_mode="release"; artifact_variant="ios-release";; release*) build_mode="release"; artifact_variant="ios-release";;
profile*) build_mode="profile"; artifact_variant="ios-profile";; profile*) build_mode="profile"; artifact_variant="ios-profile";;
debug*) build_mode="debug"; artifact_variant="ios";; debug*) build_mode="debug"; artifact_variant="ios";;
*) *)
EchoError "========================================================================" EchoError "========================================================================"
EchoError "ERROR: Unknown FLUTTER_BUILD_MODE: ${build_mode}." EchoError "ERROR: Unknown FLUTTER_BUILD_MODE: ${build_mode}."
EchoError "Valid values are 'Debug', 'Profile', or 'Release' (case insensitive)." EchoError "Valid values are 'Debug', 'Profile', or 'Release' (case insensitive)."
@ -83,8 +83,8 @@ BuildApp() {
fi fi
local framework_path="${FLUTTER_ROOT}/bin/cache/artifacts/engine/${artifact_variant}" local framework_path="${FLUTTER_ROOT}/bin/cache/artifacts/engine/${artifact_variant}"
AssertExists "${framework_path}" AssertExists "${framework_path}"
AssertExists "${project_path}" AssertExists "${project_path}"
local derived_dir="${SOURCE_ROOT}/Flutter" local derived_dir="${SOURCE_ROOT}/Flutter"
@ -360,14 +360,14 @@ EmbedFlutterFrameworks() {
# 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.
# Remove it first since Xcode might be trying to hold some of these files - this way we're # Remove it first since Xcode might be trying to hold some of these files - this way we're
# sure to get a clean copy. # sure to get a clean copy.
RunCommand rm -rf -- "${xcode_frameworks_dir}/Flutter.framework" RunCommand rm -rf -- "${xcode_frameworks_dir}/Flutter.framework"
RunCommand cp -Rv -- "${flutter_ios_engine_folder}/Flutter.framework" "${xcode_frameworks_dir}/" RunCommand cp -Rv -- "${flutter_ios_engine_folder}/Flutter.framework" "${xcode_frameworks_dir}/"
# Sign the binaries we moved. # Sign the binaries we moved.
local identity="${EXPANDED_CODE_SIGN_IDENTITY_NAME:-$CODE_SIGN_IDENTITY}" local identity="${EXPANDED_CODE_SIGN_IDENTITY_NAME:-$CODE_SIGN_IDENTITY}"
if (${identity} != ""); then if [[ -n "$identity" && "$identity" != "\"\"" ]]; then
RunCommand codesign --force --verbose --sign "${identity}" -- "${xcode_frameworks_dir}/App.framework/App" RunCommand codesign --force --verbose --sign "${identity}" -- "${xcode_frameworks_dir}/App.framework/App"
RunCommand codesign --force --verbose --sign "${identity}" -- "${xcode_frameworks_dir}/Flutter.framework/Flutter" RunCommand codesign --force --verbose --sign "${identity}" -- "${xcode_frameworks_dir}/Flutter.framework/Flutter"
fi fi