Merge pull request #4326 from NativeScript/fatme/fix-build-path

fix: use correct build output path when building for device

Author: Fatme

lib/definitions/platform.d.ts

@@ -103,13 +103,13 @@ interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
 	 * When finishes, saves .nsbuildinfo in application root folder to indicate the prepare that was used to build the app.
 	 * * .nsbuildinfo is not persisted when building for release.
 	 * @param {Mobile.IDevice} device The device where the application should be installed.
-	 * @param {IRelease} options Whether the application was built in release configuration.
+	 * @param {IBuildConfig} options The build configuration.
 	 * @param {string} @optional pathToBuiltApp Path to build artifact.
 	 * @param {string} @optional outputPath Directory containing build information and artifacts.
 	 * @param {IProjectData} projectData DTO with information about the project.
 	 * @returns {void}
 	 */
-	installApplication(device: Mobile.IDevice, options: IRelease, projectData: IProjectData, pathToBuiltApp?: string, outputPath?: string): Promise<void>;
+	installApplication(device: Mobile.IDevice, options: IBuildConfig, projectData: IProjectData, pathToBuiltApp?: string, outputPath?: string): Promise<void>;
 
 	/**
 	 * Gets first chance to validate the options provided as command line arguments.

lib/services/livesync/livesync-service.ts

@@ -267,14 +267,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 
 		// Of the properties below only `buildForDevice` and `release` are currently used.
 		// Leaving the others with placeholder values so that they may not be forgotten in future implementations.
-		const buildConfig: IBuildConfig = {
-			buildForDevice: !settings.isEmulator,
-			release: false,
-			device: settings.deviceIdentifier,
-			provision: null,
-			teamId: null,
-			projectDir: settings.projectDir
-		};
+		const buildConfig = this.getInstallApplicationBuildConfig(settings.deviceIdentifier, settings.projectDir, { isEmulator: settings.isEmulator });
 		debugData.pathToAppPackage = this.$platformService.lastOutputPath(settings.platform, buildConfig, projectData, settings.outputPath);
 		const debugInfo = await this.$debugService.debug(debugData, settings.debugOptions);
 		const result = this.printDebugInformation(debugInfo, settings.debugOptions.forceDebuggerAttachedEvent);
@@ -489,7 +482,8 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		await this.$platformService.validateInstall(options.device, options.projectData, options, options.deviceBuildInfoDescriptor.outputPath);
 		const shouldInstall = await this.$platformService.shouldInstall(options.device, options.projectData, options, options.deviceBuildInfoDescriptor.outputPath);
 		if (shouldInstall) {
-			await this.$platformService.installApplication(options.device, { release: false }, options.projectData, pathToBuildItem, options.deviceBuildInfoDescriptor.outputPath);
+			const buildConfig = this.getInstallApplicationBuildConfig(options.device.deviceInfo.identifier, options.projectData.projectDir, { isEmulator: options.device.isEmulator });
+			await this.$platformService.installApplication(options.device, buildConfig, options.projectData, pathToBuildItem, options.deviceBuildInfoDescriptor.outputPath);
 			appInstalledOnDeviceResult.appInstalled = true;
 		}
 
@@ -502,7 +496,8 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		if (rebuildInfo) {
 			// Case where we have three devices attached, a change that requires build is found,
 			// we'll rebuild the app only for the first device, but we should install new package on all three devices.
-			await this.$platformService.installApplication(options.device, { release: false }, options.projectData, rebuildInfo.pathToBuildItem, options.deviceBuildInfoDescriptor.outputPath);
+			const buildConfig = this.getInstallApplicationBuildConfig(options.device.deviceInfo.identifier, options.projectData.projectDir, { isEmulator: options.device.isEmulator });
+			await this.$platformService.installApplication(options.device, buildConfig, options.projectData, rebuildInfo.pathToBuildItem, options.deviceBuildInfoDescriptor.outputPath);
 			return rebuildInfo.pathToBuildItem;
 		}
 
@@ -875,6 +870,19 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		}
 	}
 
+	private getInstallApplicationBuildConfig(deviceIdentifier: string, projectDir: string, opts: { isEmulator: boolean }): IBuildConfig {
+		const buildConfig: IBuildConfig = {
+			buildForDevice: !opts.isEmulator,
+			release: false,
+			device: deviceIdentifier,
+			provision: null,
+			teamId: null,
+			projectDir
+		};
+
+		return buildConfig;
+	}
+
 	public emitLivesyncEvent(event: string, livesyncData: ILiveSyncEventData): boolean {
 		this.$logger.trace(`Will emit event ${event} with data`, livesyncData);
 		return this.emit(event, livesyncData);