github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2821 from chinmaygarde/master

Browse Source 
Dont differentiate between ios_arm and ios_x64 in flutter_tools
This commit is contained in:
Chinmay Garde 2016-03-21 15:02:59 -07:00
commit 931d4be5ba
8 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,8 +110,7 @@ class ApplicationPackageStore {
switch (platform) {
case TargetPlatform.android_arm:
return android;
case TargetPlatform.ios_arm:
case TargetPlatform.ios_x64:
case TargetPlatform.ios:
return iOS;
case TargetPlatform.darwin_x64:
case TargetPlatform.linux_x64:
@ -130,8 +129,7 @@ class ApplicationPackageStore {
android = new AndroidApk.fromBuildConfiguration(config);
break;
case TargetPlatform.ios_arm:
case TargetPlatform.ios_x64:
case TargetPlatform.ios:
iOS ??= new IOSApp.fromBuildConfiguration(config);
break;

6
packages/flutter_tools/lib/src/artifacts.dart
View File

@ -25,10 +25,8 @@ String getNameForTargetPlatform(TargetPlatform platform) {
switch (platform) {
case TargetPlatform.android_arm:
return 'android-arm';
case TargetPlatform.ios_arm:
return 'ios-arm';
case TargetPlatform.ios_x64:
return 'ios-x64';
case TargetPlatform.ios:
return 'ios';
case TargetPlatform.darwin_x64:
return 'darwin-x64';
case TargetPlatform.linux_x64:

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

@ -21,8 +21,7 @@ enum HostPlatform {
enum TargetPlatform {
android_arm,
ios_arm,
ios_x64,
ios,
darwin_x64,
linux_x64
}

3
packages/flutter_tools/lib/src/commands/run.dart
View File

@ -137,8 +137,7 @@ String _getMissingPackageHintForPlatform(TargetPlatform platform) {
switch (platform) {
case TargetPlatform.android_arm:
return 'Is your project missing an android/AndroidManifest.xml?';
case TargetPlatform.ios_arm:
case TargetPlatform.ios_x64:
case TargetPlatform.ios:
return 'Is your project missing an ios/Info.plist?';
default:
return null;

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

@ -229,7 +229,7 @@ class IOSDevice extends Device {
}
@override
TargetPlatform get platform => TargetPlatform.ios_arm;
TargetPlatform get platform => TargetPlatform.ios;
@override
DeviceLogReader get logReader {

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

@ -573,7 +573,7 @@ class IOSSimulator extends Device {
}
@override
TargetPlatform get platform => TargetPlatform.ios_x64;
TargetPlatform get platform => TargetPlatform.ios;
@override
DeviceLogReader get logReader {

15
packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
View File

@ -286,12 +286,7 @@ class FlutterCommandRunner extends CommandRunner {
if (hostPlatform == HostPlatform.mac) {
configs.add(new BuildConfiguration.prebuilt(
hostPlatform: HostPlatform.mac,
targetPlatform: TargetPlatform.ios_arm
));
configs.add(new BuildConfiguration.prebuilt(
hostPlatform: HostPlatform.mac,
targetPlatform: TargetPlatform.ios_x64
targetPlatform: TargetPlatform.ios
));
}
} else {
@ -323,7 +318,7 @@ class FlutterCommandRunner extends CommandRunner {
configs.add(new BuildConfiguration.local(
type: BuildType.debug,
hostPlatform: hostPlatform,
targetPlatform: TargetPlatform.ios_arm,
targetPlatform: TargetPlatform.ios,
enginePath: enginePath,
buildPath: globalResults['ios-debug-build-path']
));
@ -331,7 +326,7 @@ class FlutterCommandRunner extends CommandRunner {
configs.add(new BuildConfiguration.local(
type: BuildType.debug,
hostPlatform: hostPlatform,
targetPlatform: TargetPlatform.ios_x64,
targetPlatform: TargetPlatform.ios,
enginePath: enginePath,
buildPath: globalResults['ios-sim-debug-build-path']
));
@ -360,7 +355,7 @@ class FlutterCommandRunner extends CommandRunner {
configs.add(new BuildConfiguration.local(
type: BuildType.release,
hostPlatform: hostPlatform,
targetPlatform: TargetPlatform.ios_arm,
targetPlatform: TargetPlatform.ios,
enginePath: enginePath,
buildPath: globalResults['ios-release-build-path']
));
@ -368,7 +363,7 @@ class FlutterCommandRunner extends CommandRunner {
configs.add(new BuildConfiguration.local(
type: BuildType.release,
hostPlatform: hostPlatform,
targetPlatform: TargetPlatform.ios_x64,
targetPlatform: TargetPlatform.ios,
enginePath: enginePath,
buildPath: globalResults['ios-sim-release-build-path']
));

4
packages/flutter_tools/test/src/mocks.dart
View File

@ -45,7 +45,7 @@ class MockAndroidDevice extends Mock implements AndroidDevice {
class MockIOSDevice extends Mock implements IOSDevice {
@override
TargetPlatform get platform => TargetPlatform.ios_arm;
TargetPlatform get platform => TargetPlatform.ios;
@override
bool isSupported() => true;
@ -53,7 +53,7 @@ class MockIOSDevice extends Mock implements IOSDevice {
class MockIOSSimulator extends Mock implements IOSSimulator {
@override
TargetPlatform get platform => TargetPlatform.ios_x64;
TargetPlatform get platform => TargetPlatform.ios;
@override
bool isSupported() => true;