Merge pull request #1396 from NativeScript/fatme/ios-fix-crashing-app

Fix crash when launching applications on iOS device in debug mode

Author: Fatme

lib/common

@@ -49,6 +49,7 @@ interface IPlatformProjectServiceBase {
 interface IBuildConfig {
 	runSbGenerator?: boolean;
 	buildForDevice?: boolean;
+	architectures?: string[];
 }
 
 interface IPlatformProjectService {
@@ -59,6 +60,7 @@ interface IPlatformProjectService {
 	interpolateConfigurationFile(configurationFilePath?: string): IFuture<void>;
 	afterCreateProject(projectRoot: string): IFuture<void>;
 	buildProject(projectRoot: string, buildConfig?: IBuildConfig): IFuture<void>;
+	buildForDeploy(projectRoot: string, buildConfig?: IBuildConfig): IFuture<void>;
 	prepareProject(): IFuture<void>;
 	prepareAppResources(appResourcesDirectoryPath: string): IFuture<void>;
 	isPlatformPrepared(projectRoot: string): IFuture<boolean>;

lib/definitions/project.d.ts

@@ -238,6 +238,10 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}).future<void>()();
 	}
 
+	public buildForDeploy(projectRoot: string, buildConfig?: IBuildConfig): IFuture<void> {
+		return this.buildProject(projectRoot, buildConfig);
+	}
+
 	public isPlatformPrepared(projectRoot: string): IFuture<boolean> {
 		return this.$fs.exists(path.join(this.platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME));
 	}

lib/services/android-project-service.ts

@@ -35,7 +35,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		$projectDataService: IProjectDataService,
 		private $prompter: IPrompter,
 		private $config: IConfiguration,
-		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) {
+		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+		private $devicesService: Mobile.IDevicesService,
+		private $mobileHelper: Mobile.IMobileHelper) {
 			super($fs, $projectData, $projectDataService);
 		}
 
@@ -177,12 +179,17 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			let args: string[] = [];
 			let buildForDevice = this.$options.forDevice || (buildConfig && buildConfig.buildForDevice);
 			if (buildForDevice) {
+				let defaultArchitectures = [
+					'ARCHS=armv7 arm64',
+					'VALID_ARCHS=armv7 arm64'
+				];
+
 				args = basicArgs.concat([
 					"-sdk", "iphoneos",
-					'ARCHS=armv7 arm64',
-					'VALID_ARCHS=armv7 arm64',
 					"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "device")
 				]);
+
+				args = args.concat((buildConfig && buildConfig.architectures) || defaultArchitectures);
 			} else {
 				args = basicArgs.concat([
 					"-sdk", "iphonesimulator",
@@ -210,6 +217,29 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
+	public buildForDeploy(platform: string): IFuture<void> {
+		if (this.$options.release) {
+			return this.buildProject(this.platformData.projectRoot);
+		}
+
+		let devicesArchitectures = _(this.$devicesService.getDeviceInstances())
+			.filter(d => this.$mobileHelper.isiOSPlatform(d.deviceInfo.platform))
+			.map(d => d.deviceInfo.activeArchitecture)
+			.uniq()
+			.value();
+
+		let architectures = [
+			`ARCHS=${devicesArchitectures.join(" ")}`,
+			`VALID_ARCHS=${devicesArchitectures.join(" ")}`
+		];
+
+		if (devicesArchitectures.length > 1) {
+			architectures.push('ONLY_ACTIVE_ARCH=NO');
+		}
+
+		return this.buildProject(this.platformData.projectRoot, { architectures: architectures });
+	}
+
 	public isPlatformPrepared(projectRoot: string): IFuture<boolean> {
 		return this.$fs.exists(path.join(projectRoot, this.$projectData.projectName, constants.APP_FOLDER_NAME));
 	}

lib/services/ios-project-service.ts

@@ -306,6 +306,19 @@ export class PlatformService implements IPlatformService {
 		}).future<void>()();
 	}
 
+	public buildForDeploy(platform: string, buildConfig?: IBuildConfig): IFuture<string> {
+		return (() => {
+			platform = platform.toLowerCase();
+			if (!this.preparePlatform(platform).wait()) {
+				this.$errors.failWithoutHelp("Verify that listed files are well-formed and try again the operation.");
+			}
+
+			let platformData = this.$platformsData.getPlatformData(platform);
+			platformData.platformProjectService.buildForDeploy(platformData.projectRoot, buildConfig).wait();
+			this.$logger.out("Project successfully built");
+		}).future<string>()();
+	}
+
 	public copyLastOutput(platform: string, targetPath: string, settings: {isForDevice: boolean}): IFuture<void> {
 		return (() => {
 			let packageFile: string;
@@ -387,12 +400,12 @@ export class PlatformService implements IPlatformService {
 				return (() => {
 					if (!packageFile) {
 						if (this.$devicesService.isiOSSimulator(device)) {
-							this.buildPlatform(platform, buildConfig).wait();
+							this.buildForDeploy(platform, buildConfig).wait();
 							packageFile = this.getLatestApplicationPackageForEmulator(platformData).wait().packageName;
 						} else {
 							buildConfig = buildConfig || {};
 							buildConfig.buildForDevice = true;
-							this.buildPlatform(platform, buildConfig).wait();
+							this.buildForDeploy(platform, buildConfig).wait();
 							packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
 						}
 					}

lib/services/platform-service.ts

@@ -12,10 +12,31 @@ import * as iOSProjectServiceLib from "../lib/services/ios-project-service";
 import * as LoggerLib from "../lib/common/logger";
 import * as OptionsLib from "../lib/options";
 import * as yok from "../lib/common/yok";
+import {DevicesService} from "../lib/common/mobile/mobile-core/devices-service";
+import {MobileHelper} from "../lib/common/mobile/mobile-helper";
+import {Messages} from "../lib/common/messages/messages";
+import {MobilePlatformsCapabilities} from "../lib/mobile-platforms-capabilities";
+import {DeviceLogProvider} from "../lib/common/mobile/device-log-provider";
+import {LogFilter} from "../lib/common/mobile/log-filter";
+import {LoggingLevels} from "../lib/common/mobile/logging-levels";
+import {DeviceDiscovery} from "../lib/common/mobile/mobile-core/device-discovery";
+import {IOSDeviceDiscovery} from "../lib/common/mobile/mobile-core/ios-device-discovery";
+import {AndroidDeviceDiscovery} from "../lib/common/mobile/mobile-core/android-device-discovery";
+import {Utils} from "../lib/common/utils";
 import { assert } from "chai";
 import temp = require("temp");
 temp.track();
 
+class IOSSimulatorDiscoveryMock extends DeviceDiscovery {
+	public startLookingForDevices(): IFuture<void> {
+		return Future.fromResult();
+	}
+
+	public checkForDevices(): IFuture<void> {
+		return Future.fromResult();
+	}
+}
+
 function createTestInjector(projectPath: string, projectName: string): IInjector {
 	let testInjector = new yok.Yok();
 	testInjector.register("childProcess", ChildProcessLib.ChildProcess);
@@ -39,6 +60,19 @@ function createTestInjector(projectPath: string, projectName: string): IInjector
 	testInjector.register("projectDataService", {});
 	testInjector.register("prompter", {});
 	testInjector.register("devicePlatformsConstants", { iOS: "iOS" });
+	testInjector.register("devicesService", DevicesService);
+	testInjector.register("iOSDeviceDiscovery", IOSDeviceDiscovery);
+	testInjector.register("iOSSimulatorDiscovery", IOSSimulatorDiscoveryMock);
+	testInjector.register("iOSSimResolver", {});
+	testInjector.register("androidDeviceDiscovery", AndroidDeviceDiscovery);
+	testInjector.register("messages", Messages);
+	testInjector.register("mobileHelper", MobileHelper);
+	testInjector.register("mobilePlatformsCapabilities", MobilePlatformsCapabilities);
+	testInjector.register("deviceLogProvider", DeviceLogProvider);
+	testInjector.register("logFilter", LogFilter);
+	testInjector.register("loggingLevels", LoggingLevels);
+	testInjector.register("utils", Utils);
+	testInjector.register("iTunesValidator", {});
 	return testInjector;
 }
 

test/ios-project-service.ts

@@ -318,6 +318,9 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
 	buildProject(projectRoot: string): IFuture<void> {
 		return Future.fromResult();
 	}
+	buildForDeploy(projectRoot: string): IFuture<void> {
+		return Future.fromResult();
+	}
 	isPlatformPrepared(projectRoot: string): IFuture<boolean> {
 		return Future.fromResult(false);
 	}