fix(build-ios): Use BUILD_DIR instead of CONFIGURATION_BUILD_DIR

lib/definitions/platform.d.ts

@@ -84,7 +84,7 @@ interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
 	shouldInstall(device: Mobile.IDevice, projectData: IProjectData, release: IRelease, outputPath?: string): Promise<boolean>;
 
 	/**
-	 * 
+	 *
 	 * @param {Mobile.IDevice} device The device where the application should be installed.
 	 * @param {IProjectData} projectData DTO with information about the project.
 	 * @param {string} @optional outputPath Directory containing build information and artifacts.
@@ -259,9 +259,8 @@ interface IPlatformData {
 	projectRoot: string;
 	normalizedPlatformName: string;
 	appDestinationDirectoryPath: string;
-	deviceBuildOutputPath: string;
+	getBuildOutputPath(options: IBuildOutputOptions): string;
 	bundleBuildOutputPath?: string;
-	emulatorBuildOutputPath?: string;
 	getValidBuildOutputData(buildOptions: IBuildOutputOptions): IValidBuildOutputData;
 	frameworkFilesExtensions: string[];
 	frameworkDirectoriesExtensions?: string[];
@@ -315,7 +314,7 @@ interface INodeModulesDependenciesBuilder {
 interface IBuildInfo {
 	prepareTime: string;
 	buildTime: string;
-	/** 
+	/**
 	 * Currently it is used only for iOS.
 	 * As `xcrun` command does not throw an error when IPHONEOS_DEPLOYMENT_TARGET is provided in `xcconfig` file and
 	 * the simulator's version does not match IPHONEOS_DEPLOYMENT_TARGET's value, we need to save it to buildInfo file

lib/services/android-project-service.ts

@@ -74,7 +74,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				appDestinationDirectoryPath: path.join(...appDestinationDirectoryArr),
 				platformProjectService: this,
 				projectRoot: projectRoot,
-				deviceBuildOutputPath: path.join(...deviceBuildOutputArr),
+				getBuildOutputPath: () =>  path.join(...deviceBuildOutputArr),
 				bundleBuildOutputPath: path.join(projectRoot, constants.APP_FOLDER_NAME, constants.BUILD_DIR, constants.OUTPUTS_DIR, constants.BUNDLE_DIR),
 				getValidBuildOutputData: (buildOptions: IBuildOutputOptions): IValidBuildOutputData => {
 					const buildMode = buildOptions.release ? Configurations.Release.toLowerCase() : Configurations.Debug.toLowerCase();
@@ -332,7 +332,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		const gradleArgs = this.getGradleBuildOptions(buildConfig, projectData);
 		const baseTask = buildConfig.androidBundle ? "bundle" : "assemble";
 		const platformData = this.getPlatformData(projectData);
-		const outputPath = buildConfig.androidBundle ? platformData.bundleBuildOutputPath : platformData.deviceBuildOutputPath;
+		const outputPath = buildConfig.androidBundle ? platformData.bundleBuildOutputPath : platformData.getBuildOutputPath(buildConfig);
 		if (this.$logger.getLevel() === "TRACE") {
 			gradleArgs.unshift("--stacktrace");
 			gradleArgs.unshift("--debug");

lib/services/ios-project-service.ts

@@ -2,6 +2,7 @@ import * as path from "path";
 import * as shell from "shelljs";
 import * as semver from "semver";
 import * as constants from "../constants";
+import { Configurations } from "../common/constants";
 import * as helpers from "../common/helpers";
 import { attachAwaitDetach } from "../common/helpers";
 import * as projectServiceBaseLib from "./platform-project-service-base";
@@ -21,6 +22,12 @@ interface INativeSourceCodeGroup {
 	files: string[];
 }
 
+const DevicePlatformSdkName = "iphoneos";
+const SimulatorPlatformSdkName = "iphonesimulator";
+
+const getPlatformSdkName = (forDevice: boolean): string => forDevice ? DevicePlatformSdkName : SimulatorPlatformSdkName;
+const getConfigurationName = (release: boolean): string => release ? Configurations.Release : Configurations.Debug;
+
 export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
 	private static XCODEBUILD_MIN_VERSION = "6.0";
 	private static IOS_PROJECT_NAME_PLACEHOLDER = "__PROJECT_NAME__";
@@ -67,8 +74,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 				appDestinationDirectoryPath: path.join(projectRoot, projectData.projectName),
 				platformProjectService: this,
 				projectRoot: projectRoot,
-				deviceBuildOutputPath: path.join(projectRoot, constants.BUILD_DIR, "device"),
-				emulatorBuildOutputPath: path.join(projectRoot, constants.BUILD_DIR, "emulator"),
+				getBuildOutputPath: (options : IBuildOutputOptions): string => {
+					const config = getConfigurationName(!options || options.release);
+					return path.join(projectRoot, constants.BUILD_DIR, `${config}-${getPlatformSdkName(!options || options.buildForDevice)}`);
+				},
 				getValidBuildOutputData: (buildOptions: IBuildOutputOptions): IValidBuildOutputData => {
 					const forDevice = !buildOptions || !!buildOptions.buildForDevice;
 					if (forDevice) {
@@ -209,7 +218,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		const projectRoot = this.getPlatformData(projectData).projectRoot;
 		const archivePath = options && options.archivePath ? path.resolve(options.archivePath) : path.join(projectRoot, "/build/archive/", projectData.projectName + ".xcarchive");
 		let args = ["archive", "-archivePath", archivePath, "-configuration",
-			(!buildConfig || buildConfig.release) ? "Release" : "Debug"]
+			getConfigurationName(!buildConfig || buildConfig.release)]
 			.concat(this.xcbuildProjectArgs(projectRoot, projectData, "scheme"));
 
 		if (options && options.additionalArgs) {
@@ -282,7 +291,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		const platformData = this.getPlatformData(projectData);
 		const projectRoot = platformData.projectRoot;
 		const archivePath = options.archivePath;
-		const buildOutputPath = path.join(projectRoot, "build", "device");
+		const buildOutputPath = path.join(projectRoot, "build");
 		const exportOptionsMethod = await this.getExportOptionsMethod(projectData);
 		let plistTemplate = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -407,8 +416,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		args = args.concat((buildConfig && buildConfig.architectures) || this.getBuildArchitectures(projectData, buildConfig, ["armv7", "arm64"]));
 
 		args = args.concat([
-			"-sdk", "iphoneos",
-			"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "device")
+			"-sdk", DevicePlatformSdkName,
+			"BUILD_DIR=" + path.join(projectRoot, "build")
 		]);
 
 		const xcodeBuildVersion = await this.getXcodeVersion();
@@ -574,10 +583,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			.concat(architectures)
 			.concat([
 				"build",
-				"-configuration", buildConfig.release ? "Release" : "Debug",
-				"-sdk", "iphonesimulator",
+				"-configuration", getConfigurationName(buildConfig.release),
+				"-sdk", SimulatorPlatformSdkName,
 				"ONLY_ACTIVE_ARCH=NO",
-				"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "emulator"),
+				"BUILD_DIR=" + path.join(projectRoot, "build"),
 				"CODE_SIGN_IDENTITY=",
 			])
 			.concat(this.xcbuildProjectArgs(projectRoot, projectData));

lib/services/platform-service.ts

@@ -376,8 +376,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		}
 
 		const platformData = this.$platformsData.getPlatformData(platform, projectData);
-		const forDevice = !buildConfig || !!buildConfig.buildForDevice;
-		outputPath = outputPath || (forDevice ? platformData.deviceBuildOutputPath : platformData.emulatorBuildOutputPath || platformData.deviceBuildOutputPath);
+		outputPath = outputPath || platformData.getBuildOutputPath(buildConfig);
 		if (!this.$fs.exists(outputPath)) {
 			return true;
 		}
@@ -533,7 +532,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		}
 
 		let hashes = {};
-		const hashesFilePath = path.join(outputFilePath || platformData.deviceBuildOutputPath, constants.HASHES_FILE_NAME);
+		const hashesFilePath = path.join(outputFilePath || platformData.getBuildOutputPath(null), constants.HASHES_FILE_NAME);
 		if (this.$fs.exists(hashesFilePath)) {
 			hashes = this.$fs.readJson(hashesFilePath);
 		}
@@ -618,10 +617,10 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		}
 
 		if (platform.toLowerCase() === this.$devicePlatformsConstants.iOS.toLowerCase()) {
-			return options.buildForDevice ? platformData.deviceBuildOutputPath : platformData.emulatorBuildOutputPath;
+			return platformData.getBuildOutputPath(options);
 		}
 
-		return platformData.deviceBuildOutputPath;
+		return platformData.getBuildOutputPath(options);
 	}
 
 	private async getDeviceBuildInfoFilePath(device: Mobile.IDevice, projectData: IProjectData): Promise<string> {
@@ -904,13 +903,13 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 	}
 
 	public getLatestApplicationPackageForDevice(platformData: IPlatformData, buildConfig: IBuildConfig, outputPath?: string): IApplicationPackage {
-		return this.getLatestApplicationPackage(outputPath || platformData.deviceBuildOutputPath, platformData.getValidBuildOutputData({ buildForDevice: true, release: buildConfig.release, androidBundle: buildConfig.androidBundle }));
+		return this.getLatestApplicationPackage(outputPath || platformData.getBuildOutputPath(buildConfig), platformData.getValidBuildOutputData({ buildForDevice: true, release: buildConfig.release, androidBundle: buildConfig.androidBundle }));
 	}
 
 	public getLatestApplicationPackageForEmulator(platformData: IPlatformData, buildConfig: IBuildConfig, outputPath?: string): IApplicationPackage {
+		outputPath = outputPath || this.getBuildOutputPath(platformData.normalizedPlatformName.toLowerCase(), platformData, buildConfig);
 		const buildOutputOptions: IBuildOutputOptions = { buildForDevice: false, release: buildConfig.release, androidBundle: buildConfig.androidBundle };
-		outputPath = outputPath || this.getBuildOutputPath(platformData.normalizedPlatformName.toLowerCase(), platformData, buildOutputOptions);
-		return this.getLatestApplicationPackage(outputPath || platformData.emulatorBuildOutputPath || platformData.deviceBuildOutputPath, platformData.getValidBuildOutputData(buildOutputOptions));
+		return this.getLatestApplicationPackage(outputPath || platformData.getBuildOutputPath(buildConfig), platformData.getValidBuildOutputData(buildOutputOptions));
 	}
 
 	private async updatePlatform(platform: string, version: string, platformTemplate: string, projectData: IProjectData, config: IPlatformOptions): Promise<void> {

test/platform-commands.ts

@@ -39,7 +39,7 @@ class PlatformData implements IPlatformData {
 		}
 	};
 	projectRoot = "";
-	deviceBuildOutputPath = "";
+	getBuildOutputPath = () => "";
 	getValidBuildOutputData = (buildOptions: IBuildOutputOptions) => ({ packageNames: [""] });
 	validPackageNamesForDevice: string[] = [];
 	frameworkFilesExtensions = [".jar", ".dat"];

test/platform-service.ts

@@ -264,7 +264,7 @@ describe('Platform Service Tests', () => {
 						projectRoot: "",
 						normalizedPlatformName: "",
 						appDestinationDirectoryPath: "",
-						deviceBuildOutputPath: "",
+						getBuildOutputPath: () => "",
 						getValidBuildOutputData: (buildOptions: IBuildOutputOptions) => ({ packageNames: [] }),
 						frameworkFilesExtensions: [],
 						relativeToFrameworkConfigurationFilePath: "",
@@ -981,6 +981,7 @@ describe('Platform Service Tests', () => {
 				return {
 					deviceBuildOutputPath: "",
 					normalizedPlatformName: "",
+					getBuildOutputPath: () => "",
 					platformProjectService: {
 						buildProject: () => Promise.resolve(),
 						on: () => ({}),

test/services/android-project-service.ts

@@ -76,7 +76,8 @@ describe("androidDeviceDebugService", () => {
 			const getPlatformDataStub: sinon.SinonStub = sandbox.stub(androidProjectService, "getPlatformData");
 			getPlatformDataStub.callsFake(() => {
 				return {
-					configurationFilePath: ""
+					configurationFilePath: "",
+					getBuildOutputPath: () => ""
 				};
 			});
 		});

test/stubs.ts

@@ -379,7 +379,7 @@ export class PlatformProjectServiceStub extends EventEmitter implements IPlatfor
 			normalizedPlatformName: "",
 			platformProjectService: this,
 			projectRoot: "",
-			deviceBuildOutputPath: "",
+			getBuildOutputPath: () => "",
 			getValidBuildOutputData: (buildOptions: IBuildOutputOptions) => ({ packageNames: [] }),
 			frameworkFilesExtensions: [],
 			appDestinationDirectoryPath: "",
@@ -490,7 +490,7 @@ export class PlatformsDataStub extends EventEmitter implements IPlatformsData {
 			projectRoot: "",
 			normalizedPlatformName: "",
 			appDestinationDirectoryPath: "",
-			deviceBuildOutputPath: "",
+			getBuildOutputPath: () => "",
 			getValidBuildOutputData: (buildOptions: IBuildOutputOptions) => ({ packageNames: [] }),
 			frameworkFilesExtensions: [],
 			relativeToFrameworkConfigurationFilePath: "",