Fixed incremental build when running on device and for release

Author: Tsvetan Raikov

lib/services/platform-service.ts

@@ -348,7 +348,8 @@ export class PlatformService implements IPlatformService {
 		return (() => {
 			let shouldBuild = this.preparePlatform(platform, false).wait();
 			let platformData = this.$platformsData.getPlatformData(platform);
-			let buildInfoFile = path.join(platformData.projectRoot, buildInfoFileName);
+			let buildInfoFilePath = this.getBuildOutputPath(platform, platformData, buildConfig);
+			let buildInfoFile = path.join(buildInfoFilePath, buildInfoFileName);
 			if (!shouldBuild) {
 				if (this.$fs.exists(buildInfoFile).wait()) {
 					let buildInfoText = this.$fs.readText(buildInfoFile).wait();
@@ -364,6 +365,14 @@ export class PlatformService implements IPlatformService {
 		}).future<void>()();
 	}
 
+	private getBuildOutputPath(platform: string, platformData: IPlatformData, buildConfig?: IBuildConfig): string {
+		let buildForDevice = buildConfig ? buildConfig.buildForDevice : false;
+		if (platform === this.$devicePlatformsConstants.iOS.toLowerCase()) {
+			return buildForDevice ? platformData.deviceBuildOutputPath : platformData.emulatorBuildOutputPath;
+		}
+		return platformData.deviceBuildOutputPath;
+	}
+
 	public buildForDeploy(platform: string, buildConfig?: IBuildConfig): IFuture<void> {
 		return (() => {
 			platform = platform.toLowerCase();
@@ -467,7 +476,7 @@ export class PlatformService implements IPlatformService {
 						} else {
 							let deviceBuildConfig = buildConfig || {};
 							deviceBuildConfig.buildForDevice = true;
-							this.prepareAndBuild(platform, buildConfig).wait();
+							this.prepareAndBuild(platform, deviceBuildConfig).wait();
 							packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
 						}
 					}

lib/services/project-changes-info.ts

@@ -5,6 +5,7 @@ const prepareInfoFileName = ".nsprepareinfo";
 export interface IPrepareInfo {
 	time: string;
 	bundle: boolean;
+	release: boolean;
 }
 
 export class ProjectChangesInfo {
@@ -36,7 +37,7 @@ export class ProjectChangesInfo {
 				this.appResourcesChanged = true;
 				this.modulesChanged = true;
 				this.configChanged = true;
-				this.prepareInfo = { time: "", bundle: $options.bundle };
+				this.prepareInfo = { time: "", bundle: $options.bundle, release: $options.release };
 			} else {
 				let outputProjectMtime = this.$fs.getFsStats(buildInfoFile).wait().mtime.getTime();
 				this.prepareInfo = this.$fs.readJson(buildInfoFile).wait();
@@ -58,10 +59,21 @@ export class ProjectChangesInfo {
 						], outputProjectMtime);
 					}
 				}
+
 				if (this.$options.bundle !== this.prepareInfo.bundle) {
 					this.modulesChanged = true;
 					this.prepareInfo.bundle = this.$options.bundle;
 				}
+				if (this.$options.release !== this.prepareInfo.release) {
+					this.appFilesChanged = true;
+					this.appResourcesChanged = true;
+					this.modulesChanged = true;
+					this.configChanged = true;
+					this.prepareInfo.release = this.$options.release;
+				}
+				if (this.modulesChanged || this.appResourcesChanged) {
+					this.configChanged = true;
+				}
 			}
 
 			if (this.hasChanges) {