Merge pull request #3419 from NativeScript/plamen5kov/fix-apk-search-dir

Plamen5kov · web-flow · commit 69bc28740626 · 2018-03-08T11:03:21.000+02:00
fix: find correct apk name when --release passed
diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts
@@ -81,7 +81,7 @@ interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
 	 * @param {string} @optional outputPath Directory containing build information and artifacts.
 	 * @returns {Promise<boolean>} true indicates that the application should be installed.
 	 */
-	shouldInstall(device: Mobile.IDevice, projectData: IProjectData, outputPath?: string): Promise<boolean>;
+	shouldInstall(device: Mobile.IDevice, projectData: IProjectData, release: IRelease, outputPath?: string): Promise<boolean>;
 
 	/**
 	 * Determines whether the project should undergo the prepare process.
@@ -260,7 +260,7 @@ interface IPlatformData {
 	projectRoot: string;
 	normalizedPlatformName: string;
 	appDestinationDirectoryPath: string;
-	deviceBuildOutputPath: string;
+	getDeviceBuildOutputPath(options: IRelease): string;
 	emulatorBuildOutputPath?: string;
 	getValidPackageNames(buildOptions: { isReleaseBuild?: boolean, isForDevice?: boolean }): string[];
 	frameworkFilesExtensions: string[];
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -142,6 +142,10 @@ interface IBuildForDevice {
 	buildForDevice: boolean;
 }
 
+interface IShouldInstall extends IBuildForDevice, IRelease {
+	
+}
+
 interface INativePrepare {
 	skipNativePrepare: boolean;
 }
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -83,7 +83,9 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				platformProjectService: this,
 				emulatorServices: this.$androidEmulatorServices,
 				projectRoot: projectRoot,
-				deviceBuildOutputPath: this.getDeviceBuildOutputPath(path.join(...deviceBuildOutputArr), projectData),
+				getDeviceBuildOutputPath: (options: IRelease): string => {
+					return this.getDeviceBuildOutputPath(path.join(...deviceBuildOutputArr), projectData, options);
+				},
 				getValidPackageNames: (buildOptions: { isReleaseBuild?: boolean, isForDevice?: boolean }): string[] => {
 					const buildMode = buildOptions.isReleaseBuild ? Configurations.Release.toLowerCase() : Configurations.Debug.toLowerCase();
 
@@ -106,10 +108,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return this._platformData;
 	}
 
-	private getDeviceBuildOutputPath(currentPath: string, projectData: IProjectData): string {
+	private getDeviceBuildOutputPath(currentPath: string, projectData: IProjectData, options: IRelease): string {
 		const currentPlatformData: IDictionary<any> = this.$projectDataService.getNSValue(projectData.projectDir, constants.TNS_ANDROID_RUNTIME_NAME);
 		const platformVersion = currentPlatformData && currentPlatformData[constants.VERSION_STRING];
-		const normalizedPath = path.join(currentPath, "debug");
+		const buildType = options.release === true ? "release" : "debug";
+		const normalizedPath = path.join(currentPath, buildType);
 
 		if (semver.valid(platformVersion)) {
 			const gradleAndroidPluginVersion3xx = "4.0.0";
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
@@ -71,7 +71,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 				platformProjectService: this,
 				emulatorServices: this.$iOSEmulatorServices,
 				projectRoot: projectRoot,
-				deviceBuildOutputPath: path.join(projectRoot, "build", "device"),
+				getDeviceBuildOutputPath: (options: IRelease): string => {
+					return path.join(projectRoot, "build", "device");
+				},
 				emulatorBuildOutputPath: path.join(projectRoot, "build", "emulator"),
 				getValidPackageNames: (buildOptions: { isReleaseBuild?: boolean, isForDevice?: boolean }): string[] => {
 					if (buildOptions.isForDevice) {
diff --git a/lib/services/livesync/livesync-service.ts b/lib/services/livesync/livesync-service.ts
@@ -413,7 +413,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 
 		await this.trackAction(action, platform, options);
 
-		const shouldInstall = await this.$platformService.shouldInstall(options.device, options.projectData, 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);
 			appInstalledOnDeviceResult.appInstalled = true;
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -333,7 +333,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 || (forDevice ? platformData.getDeviceBuildOutputPath(buildConfig) : platformData.emulatorBuildOutputPath || platformData.getDeviceBuildOutputPath(buildConfig));
 		if (!this.$fs.exists(outputPath)) {
 			return true;
 		}
@@ -433,15 +433,15 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		this.$fs.writeJson(buildInfoFile, buildInfo);
 	}
 
-	public async shouldInstall(device: Mobile.IDevice, projectData: IProjectData, outputPath?: string): Promise<boolean> {
+	public async shouldInstall(device: Mobile.IDevice, projectData: IProjectData, release: IBuildConfig, outputPath?: string): Promise<boolean> {
 		const platform = device.deviceInfo.platform;
 		if (!(await device.applicationManager.isApplicationInstalled(projectData.projectId))) {
 			return true;
 		}
 
 		const platformData = this.$platformsData.getPlatformData(platform, projectData);
 		const deviceBuildInfo: IBuildInfo = await this.getDeviceBuildInfo(device, projectData);
-		const localBuildInfo = this.getBuildInfo(platform, platformData, { buildForDevice: !device.isEmulator }, outputPath);
+		const localBuildInfo = this.getBuildInfo(platform, platformData, { buildForDevice: !device.isEmulator, release: release.release }, outputPath);
 		return !localBuildInfo || !deviceBuildInfo || deviceBuildInfo.buildTime !== localBuildInfo.buildTime;
 	}
 
@@ -469,7 +469,9 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 		if (!buildConfig.release) {
 			const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
-			const buildInfoFilePath = outputFilePath || this.getBuildOutputPath(device.deviceInfo.platform, platformData, { buildForDevice: !device.isEmulator });
+			const options = buildConfig;
+			options.buildForDevice = !device.isEmulator;
+			const buildInfoFilePath = outputFilePath || this.getBuildOutputPath(device.deviceInfo.platform, platformData, options);
 			const appIdentifier = projectData.projectId;
 
 			await device.fileSystem.putFile(path.join(buildInfoFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
@@ -515,8 +517,8 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 				this.$logger.out("Skipping package build. No changes detected on the native side. This will be fast!");
 			}
 
-			if (deployInfo.deployOptions.forceInstall || shouldBuild || (await this.shouldInstall(device, deployInfo.projectData))) {
-				await this.installApplication(device, buildConfig, deployInfo.projectData, installPackageFile, deployInfo.outputPath);
+			if (deployInfo.deployOptions.forceInstall || shouldBuild || (await this.shouldInstall(device, deployInfo.projectData, buildConfig))) {
+				await this.installApplication(device, buildConfig, deployInfo.projectData);
 			} else {
 				this.$logger.out("Skipping install.");
 			}
@@ -550,12 +552,12 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		await this.$devicesService.execute(action, this.getCanExecuteAction(platform, runOptions));
 	}
 
-	private getBuildOutputPath(platform: string, platformData: IPlatformData, options: IBuildForDevice): string {
+	private getBuildOutputPath(platform: string, platformData: IPlatformData, options: IShouldInstall): string {
 		if (platform.toLowerCase() === this.$devicePlatformsConstants.iOS.toLowerCase()) {
-			return options.buildForDevice ? platformData.deviceBuildOutputPath : platformData.emulatorBuildOutputPath;
+			return options.buildForDevice ? platformData.getDeviceBuildOutputPath(options) : platformData.emulatorBuildOutputPath;
 		}
 
-		return platformData.deviceBuildOutputPath;
+		return platformData.getDeviceBuildOutputPath(options);
 	}
 
 	private async getDeviceBuildInfoFilePath(device: Mobile.IDevice, projectData: IProjectData): Promise<string> {
@@ -575,7 +577,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		}
 	}
 
-	private getBuildInfo(platform: string, platformData: IPlatformData, options: IBuildForDevice, buildOutputPath?: string): IBuildInfo {
+	private getBuildInfo(platform: string, platformData: IPlatformData, options: IShouldInstall, buildOutputPath?: string): IBuildInfo {
 		buildOutputPath = buildOutputPath || this.getBuildOutputPath(platform, platformData, options);
 		const buildInfoFile = path.join(buildOutputPath, buildInfoFileName);
 		if (this.$fs.exists(buildInfoFile)) {
@@ -765,11 +767,11 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 	}
 
 	public getLatestApplicationPackageForDevice(platformData: IPlatformData, buildConfig: IBuildConfig, outputPath?: string): IApplicationPackage {
-		return this.getLatestApplicationPackage(outputPath || platformData.deviceBuildOutputPath, platformData.getValidPackageNames({ isForDevice: true, isReleaseBuild: buildConfig.release }));
+		return this.getLatestApplicationPackage(outputPath || platformData.getDeviceBuildOutputPath(buildConfig), platformData.getValidPackageNames({ isForDevice: true, isReleaseBuild: buildConfig.release }));
 	}
 
 	public getLatestApplicationPackageForEmulator(platformData: IPlatformData, buildConfig: IBuildConfig, outputPath?: string): IApplicationPackage {
-		return this.getLatestApplicationPackage(outputPath || platformData.emulatorBuildOutputPath || platformData.deviceBuildOutputPath, platformData.getValidPackageNames({ isForDevice: false, isReleaseBuild: buildConfig.release }));
+		return this.getLatestApplicationPackage(outputPath || platformData.emulatorBuildOutputPath || platformData.getDeviceBuildOutputPath(buildConfig), platformData.getValidPackageNames({ isForDevice: false, isReleaseBuild: buildConfig.release }));
 	}
 
 	private async updatePlatform(platform: string, version: string, platformTemplate: string, projectData: IProjectData, config: IPlatformOptions): Promise<void> {
diff --git a/test/platform-commands.ts b/test/platform-commands.ts
@@ -35,7 +35,9 @@ class PlatformData implements IPlatformData {
 	};
 	emulatorServices: Mobile.IEmulatorPlatformServices = null;
 	projectRoot = "";
-	deviceBuildOutputPath = "";
+	getDeviceBuildOutputPath = (buildTypeOption: IRelease) => {
+		return "";
+	}
 	getValidPackageNames = (buildOptions: { isForDevice?: boolean, isReleaseBuild?: boolean }) => [""];
 	validPackageNamesForDevice: string[] = [];
 	frameworkFilesExtensions = [".jar", ".dat"];
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -304,7 +304,9 @@ export class PlatformProjectServiceStub extends EventEmitter implements IPlatfor
 			platformProjectService: this,
 			emulatorServices: undefined,
 			projectRoot: "",
-			deviceBuildOutputPath: "",
+			getDeviceBuildOutputPath: (buildTypeOption: IRelease) => {
+				return "";
+			},
 			getValidPackageNames: (buildOptions: { isForDevice?: boolean, isReleaseBuild?: boolean }) => [],
 			frameworkFilesExtensions: [],
 			appDestinationDirectoryPath: "",
@@ -415,7 +417,9 @@ export class PlatformsDataStub extends EventEmitter implements IPlatformsData {
 			projectRoot: "",
 			normalizedPlatformName: "",
 			appDestinationDirectoryPath: "",
-			deviceBuildOutputPath: "",
+			getDeviceBuildOutputPath: (buildTypeOption: IRelease) => {
+				return "";
+			},
 			getValidPackageNames: (buildOptions: { isForDevice?: boolean, isReleaseBuild?: boolean }) => [],
 			frameworkFilesExtensions: [],
 			relativeToFrameworkConfigurationFilePath: "",

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,10 @@ interface IBuildForDevice {`
`142`	`142`	`buildForDevice: boolean;`
`143`	`143`	`}`
`144`	`144`
	`145`	`+interface IShouldInstall extends IBuildForDevice, IRelease {`
	`146`	`+`
	`147`	`+}`
	`148`	`+`
`145`	`149`	`interface INativePrepare {`
`146`	`150`	`skipNativePrepare: boolean;`
`147`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {`
`333`	`333`
`334`	`334`	`const platformData = this.$platformsData.getPlatformData(platform, projectData);`
`335`	`335`	`const forDevice = !buildConfig \|\| buildConfig.buildForDevice;`
`336`		`- outputPath = outputPath \|\| (forDevice ? platformData.deviceBuildOutputPath : platformData.emulatorBuildOutputPath \|\| platformData.deviceBuildOutputPath);`
	`336`	`+ outputPath = outputPath \|\| (forDevice ? platformData.getDeviceBuildOutputPath(buildConfig) : platformData.emulatorBuildOutputPath \|\| platformData.getDeviceBuildOutputPath(buildConfig));`
`337`	`337`	`if (!this.$fs.exists(outputPath)) {`
`338`	`338`	`return true;`
`339`	`339`	`}`
`@@ -433,15 +433,15 @@ export class PlatformService extends EventEmitter implements IPlatformService {`
`433`	`433`	`this.$fs.writeJson(buildInfoFile, buildInfo);`
`434`	`434`	`}`
`435`	`435`
`436`		`- public async shouldInstall(device: Mobile.IDevice, projectData: IProjectData, outputPath?: string): Promise<boolean> {`
	`436`	`+ public async shouldInstall(device: Mobile.IDevice, projectData: IProjectData, release: IBuildConfig, outputPath?: string): Promise<boolean> {`
`437`	`437`	`const platform = device.deviceInfo.platform;`
`438`	`438`	`if (!(await device.applicationManager.isApplicationInstalled(projectData.projectId))) {`
`439`	`439`	`return true;`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`const platformData = this.$platformsData.getPlatformData(platform, projectData);`
`443`	`443`	`const deviceBuildInfo: IBuildInfo = await this.getDeviceBuildInfo(device, projectData);`
`444`		`- const localBuildInfo = this.getBuildInfo(platform, platformData, { buildForDevice: !device.isEmulator }, outputPath);`
	`444`	`+ const localBuildInfo = this.getBuildInfo(platform, platformData, { buildForDevice: !device.isEmulator, release: release.release }, outputPath);`
`445`	`445`	`return !localBuildInfo \|\| !deviceBuildInfo \|\| deviceBuildInfo.buildTime !== localBuildInfo.buildTime;`
`446`	`446`	`}`
`447`	`447`
`@@ -469,7 +469,9 @@ export class PlatformService extends EventEmitter implements IPlatformService {`
`469`	`469`
`470`	`470`	`if (!buildConfig.release) {`
`471`	`471`	`const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);`
`472`		`- const buildInfoFilePath = outputFilePath \|\| this.getBuildOutputPath(device.deviceInfo.platform, platformData, { buildForDevice: !device.isEmulator });`
	`472`	`+ const options = buildConfig;`
	`473`	`+ options.buildForDevice = !device.isEmulator;`
	`474`	`+ const buildInfoFilePath = outputFilePath \|\| this.getBuildOutputPath(device.deviceInfo.platform, platformData, options);`
`473`	`475`	`const appIdentifier = projectData.projectId;`
`474`	`476`
`475`	`477`	`await device.fileSystem.putFile(path.join(buildInfoFilePath, buildInfoFileName), deviceFilePath, appIdentifier);`
`@@ -515,8 +517,8 @@ export class PlatformService extends EventEmitter implements IPlatformService {`
`515`	`517`	`this.$logger.out("Skipping package build. No changes detected on the native side. This will be fast!");`
`516`	`518`	`}`
`517`	`519`
`518`		`- if (deployInfo.deployOptions.forceInstall \|\| shouldBuild \|\| (await this.shouldInstall(device, deployInfo.projectData))) {`
`519`		`- await this.installApplication(device, buildConfig, deployInfo.projectData, installPackageFile, deployInfo.outputPath);`
	`520`	`+ if (deployInfo.deployOptions.forceInstall \|\| shouldBuild \|\| (await this.shouldInstall(device, deployInfo.projectData, buildConfig))) {`
	`521`	`+ await this.installApplication(device, buildConfig, deployInfo.projectData);`
`520`	`522`	`} else {`
`521`	`523`	`this.$logger.out("Skipping install.");`
`522`	`524`	`}`
`@@ -550,12 +552,12 @@ export class PlatformService extends EventEmitter implements IPlatformService {`
`550`	`552`	`await this.$devicesService.execute(action, this.getCanExecuteAction(platform, runOptions));`
`551`	`553`	`}`
`552`	`554`
`553`		`- private getBuildOutputPath(platform: string, platformData: IPlatformData, options: IBuildForDevice): string {`
	`555`	`+ private getBuildOutputPath(platform: string, platformData: IPlatformData, options: IShouldInstall): string {`
`554`	`556`	`if (platform.toLowerCase() === this.$devicePlatformsConstants.iOS.toLowerCase()) {`
`555`		`- return options.buildForDevice ? platformData.deviceBuildOutputPath : platformData.emulatorBuildOutputPath;`
	`557`	`+ return options.buildForDevice ? platformData.getDeviceBuildOutputPath(options) : platformData.emulatorBuildOutputPath;`
`556`	`558`	`}`
`557`	`559`
`558`		`- return platformData.deviceBuildOutputPath;`
	`560`	`+ return platformData.getDeviceBuildOutputPath(options);`
`559`	`561`	`}`
`560`	`562`
`561`	`563`	`private async getDeviceBuildInfoFilePath(device: Mobile.IDevice, projectData: IProjectData): Promise<string> {`
`@@ -575,7 +577,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {`
`575`	`577`	`}`
`576`	`578`	`}`
`577`	`579`
`578`		`- private getBuildInfo(platform: string, platformData: IPlatformData, options: IBuildForDevice, buildOutputPath?: string): IBuildInfo {`
	`580`	`+ private getBuildInfo(platform: string, platformData: IPlatformData, options: IShouldInstall, buildOutputPath?: string): IBuildInfo {`
`579`	`581`	`buildOutputPath = buildOutputPath \|\| this.getBuildOutputPath(platform, platformData, options);`
`580`	`582`	`const buildInfoFile = path.join(buildOutputPath, buildInfoFileName);`
`581`	`583`	`if (this.$fs.exists(buildInfoFile)) {`
`@@ -765,11 +767,11 @@ export class PlatformService extends EventEmitter implements IPlatformService {`
`765`	`767`	`}`
`766`	`768`
`767`	`769`	`public getLatestApplicationPackageForDevice(platformData: IPlatformData, buildConfig: IBuildConfig, outputPath?: string): IApplicationPackage {`
`768`		`- return this.getLatestApplicationPackage(outputPath \|\| platformData.deviceBuildOutputPath, platformData.getValidPackageNames({ isForDevice: true, isReleaseBuild: buildConfig.release }));`
	`770`	`+ return this.getLatestApplicationPackage(outputPath \|\| platformData.getDeviceBuildOutputPath(buildConfig), platformData.getValidPackageNames({ isForDevice: true, isReleaseBuild: buildConfig.release }));`
`769`	`771`	`}`
`770`	`772`
`771`	`773`	`public getLatestApplicationPackageForEmulator(platformData: IPlatformData, buildConfig: IBuildConfig, outputPath?: string): IApplicationPackage {`
`772`		`- return this.getLatestApplicationPackage(outputPath \|\| platformData.emulatorBuildOutputPath \|\| platformData.deviceBuildOutputPath, platformData.getValidPackageNames({ isForDevice: false, isReleaseBuild: buildConfig.release }));`
	`774`	`+ return this.getLatestApplicationPackage(outputPath \|\| platformData.emulatorBuildOutputPath \|\| platformData.getDeviceBuildOutputPath(buildConfig), platformData.getValidPackageNames({ isForDevice: false, isReleaseBuild: buildConfig.release }));`
`773`	`775`	`}`
`774`	`776`
`775`	`777`	`private async updatePlatform(platform: string, version: string, platformTemplate: string, projectData: IProjectData, config: IPlatformOptions): Promise<void> {`