DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support Xcode variable substitution in Info.plist

Browse Source 
As of Xcode 7, Apple recommends setting CFBundleIdentifier to
$(PRODUCT_BUNDLE_IDENTIFIER).
This commit is contained in:
Chris Bracken 2016-09-26 13:25:57 -07:00
parent 55f48f72c9
commit a45e4e923c
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/flutter_tools/lib/src/application_package.dart
View File

@ -12,6 +12,7 @@ import 'base/process.dart';
import 'build_info.dart';
import 'globals.dart';
import 'ios/plist_utils.dart';
import 'ios/xcodeproj.dart';
abstract class ApplicationPackage {
/// Package ID from the Android Manifest or equivalent.
@ -137,6 +138,8 @@ class IOSApp extends ApplicationPackage {
String value = getValueFromFile(plistPath, kCFBundleIdentifierKey);
if (value == null)
return null;
String projectPath = path.join('ios', 'Runner.xcodeproj');
value = substituteXcodeVariables(value, projectPath, 'Runner');
return new IOSApp(
appDirectory: path.join('ios'),

2
packages/flutter_tools/lib/src/ios/mac.dart
View File

@ -15,7 +15,7 @@ import '../build_info.dart';
import '../flx.dart' as flx;
import '../globals.dart';
import '../services.dart';
import 'setup_xcodeproj.dart';
import 'xcodeproj.dart';
String get homeDirectory => path.absolute(Platform.environment['HOME']);

29
packages/flutter_tools/lib/src/ios/setup_xcodeproj.dart → packages/flutter_tools/lib/src/ios/xcodeproj.dart
View File

@ -6,10 +6,14 @@ import 'dart:io';
import 'package:path/path.dart' as path;
import '../base/process.dart';
import '../build_info.dart';
import '../cache.dart';
import '../globals.dart';
final RegExp _settingExpr = new RegExp(r'(\w+)\s*=\s*(\S+)');
final RegExp _varExpr = new RegExp(r'\$\((.*)\)');
void updateXcodeGeneratedProperties(String projectPath, BuildMode mode, String target) {
StringBuffer localsBuffer = new StringBuffer();
@ -43,3 +47,28 @@ void updateXcodeGeneratedProperties(String projectPath, BuildMode mode, String t
localsFile.createSync(recursive: true);
localsFile.writeAsStringSync(localsBuffer.toString());
}
Map<String, String> getXcodeBuildSettings(String xcodeProjPath, String target) {
String absProjPath = path.absolute(xcodeProjPath);
String out = runCheckedSync(<String>[
'/usr/bin/xcodebuild', '-project', absProjPath, '-target', target, '-showBuildSettings'
]);
Map<String, String> settings = <String, String>{};
for (String line in out.split('\n').where(_settingExpr.hasMatch)) {
Match match = _settingExpr.firstMatch(line);
settings[match[1]] = match[2];
}
return settings;
}
/// Substitutes variables in [str] with their values from the specified Xcode
/// project and target.
String substituteXcodeVariables(String str, String xcodeProjPath, String target) {
Iterable<Match> matches = _varExpr.allMatches(str);
if (matches.isEmpty)
return str;
Map<String, String> settings = getXcodeBuildSettings(xcodeProjPath, target);
return str.replaceAllMapped(_varExpr, (Match m) => settings[m[1]] ?? m[0]);
}