Merge pull request #1070 from NativeScript/fatme/merge-release

Merge release

Author: teobugslayer

docs/man_pages/project/testing/build-android.md

@@ -3,7 +3,7 @@ build android
 
 Usage | Synopsis
 ---|---
-General | `$ tns build android [--compileSdk <API Level>] [--key-store-path <File Path> --key-store-password <Password> --key-store-alias <Name> --key-store-alias-password <Password>] [--release] [--static-bindings]`
+General | `$ tns build android [--compileSdk <API Level>] [--key-store-path <File Path> --key-store-password <Password> --key-store-alias <Name> --key-store-alias-password <Password>] [--release] [--static-bindings] [--copy-to <File Path>]`
 
 Builds the project for Android and produces an APK that you can manually deploy on device or in the native emulator.
 
@@ -15,8 +15,9 @@ Builds the project for Android and produces an APK that you can manually deploy
 * `--key-store-alias` - Provides the alias for the keystore file specified with `--key-store-path`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--key-store-alias-password` - Provides the password for the alias specified with `--key-store-alias-password`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--static-bindings` - **This is an experimental feature**. If set, generates static bindings from your JavaScript code to corresponding native Android APIs during build. This static bindings speed up app loading.[\*\*](#note)
+* `--copy-to` - Specifies the file path where the built `.apk` will be copied. If it points to a non-existent directory, it will be created. If the specified value is directory, the original file name will be used.
 
-<% if(isHtml) { %><a id="note"></a><% } %>
+<% if(isHtml) { %><a id="note"></a><% } %>
 \*\* By default, NativeScript runtime for Android uses runtime binding generator. When you extend a Java class and overwrite a lot of methods, this could be a potentially slow operation.
 
 ### Attributes

docs/man_pages/project/testing/build-ios.md

@@ -3,19 +3,20 @@ build ios
 
 Usage | Synopsis
 ---|---
-General | `$ tns build ios [--for-device] [--release]`
+General | `$ tns build ios [--for-device] [--release] [--copy-to <File Path>]`
 
 Builds the project for iOS and produces an `APP` or `IPA` that you can manually deploy in the iOS Simulator or on device, respectively.
 
-<% if(isConsole && (isWindows || isLinux)) { %>WARNING: You can run this command only on OS X systems. To view the complete help for this command, run `$ tns help build ios`<% } %> 
-<% if((isConsole && isMacOS) || isHtml) { %>  
-<% if(isHtml) { %>> <% } %>IMPORTANT: Before building for iOS device, verify that you have configured a valid pair of certificate and provisioning profile on your OS X system. <% if(isHtml) { %>For more information, see [Obtaining Signing Identities and Downloading Provisioning Profiles](https://developer.apple.com/library/mac/recipes/xcode_help-accounts_preferences/articles/obtain_certificates_and_provisioning_profiles.html).<% } %> 
+<% if(isConsole && (isWindows || isLinux)) { %>WARNING: You can run this command only on OS X systems. To view the complete help for this command, run `$ tns help build ios`<% } %>
+<% if((isConsole && isMacOS) || isHtml) { %>
+<% if(isHtml) { %>> <% } %>IMPORTANT: Before building for iOS device, verify that you have configured a valid pair of certificate and provisioning profile on your OS X system. <% if(isHtml) { %>For more information, see [Obtaining Signing Identities and Downloading Provisioning Profiles](https://developer.apple.com/library/mac/recipes/xcode_help-accounts_preferences/articles/obtain_certificates_and_provisioning_profiles.html).<% } %>
 
 ### Options
 * `--release` - If set, produces a release build. Otherwise, produces a debug build.
 * `--for-device` - If set, produces an application package that you can deploy on device. Otherwise, produces a build that you can run only in the native iOS Simulator.
+* `--copy-to` - Specifies the file path where the built `.ipa` will be copied. If it points to a non-existent directory, it will be created. If the specified value is directory, the original file name will be used.
 <% } %>
-<% if(isHtml) { %> 
+<% if(isHtml) { %>
 ### Command Limitations
 
 * You can run `$ tns build ios` only on OS X systems.

lib/commands/build.ts

@@ -2,17 +2,25 @@
 "use strict";
 
 export class BuildCommandBase {
-	constructor(private $platformService: IPlatformService) { }
+	constructor(protected $options: IOptions,
+		private $platformService: IPlatformService) { }
 
 	executeCore(args: string[], buildConfig?: IBuildConfig): IFuture<void> {
-		return this.$platformService.buildPlatform(args[0], buildConfig);
+		return (() => {
+			let platform = args[0].toLowerCase();
+			this.$platformService.buildPlatform(platform, buildConfig).wait();
+			if(this.$options.copyTo) {
+				this.$platformService.copyLastOutput(platform, this.$options.copyTo, {isForDevice: this.$options.forDevice}).wait();
+			}
+		}).future<void>()();
 	}
 }
 
 export class BuildIosCommand extends BuildCommandBase implements  ICommand {
-	constructor($platformService: IPlatformService,
-		private $platformsData: IPlatformsData) {
-		super($platformService);
+	constructor(protected $options: IOptions,
+				private $platformsData: IPlatformsData,
+				$platformService: IPlatformService) {
+		super($options, $platformService);
 	}
 
 	public allowedParameters: ICommandParameter[] = [];
@@ -24,11 +32,11 @@ export class BuildIosCommand extends BuildCommandBase implements  ICommand {
 $injector.registerCommand("build|ios", BuildIosCommand);
 
 export class BuildAndroidCommand extends BuildCommandBase implements  ICommand {
-	constructor($platformService: IPlatformService,
+	constructor(protected $options: IOptions,
 				private $platformsData: IPlatformsData,
-				private $options: IOptions,
-				private $errors: IErrors) {
-		super($platformService);
+				private $errors: IErrors,
+				$platformService: IPlatformService) {
+		super($options, $platformService);
 	}
 
 	public execute(args: string[]): IFuture<void> {

lib/declarations.ts

@@ -82,6 +82,7 @@ interface IOptions extends ICommonOptions {
 	tnsModulesVersion: string;
 	staticBindings: boolean;
 	compileSdk: number;
+	copyTo: string;
 }
 
 interface IProjectFilesManager {

lib/definitions/platform.d.ts

@@ -16,6 +16,7 @@ interface IPlatformService {
 
 	getLatestApplicationPackageForDevice(platformData: IPlatformData): IFuture<IApplicationPackage>;
 	getLatestApplicationPackageForEmulator(platformData: IPlatformData): IFuture<IApplicationPackage>;
+	copyLastOutput(platform: string, targetPath: string, settings: {isForDevice: boolean}): IFuture<void>;
 }
 
 interface IPlatformData {

lib/options.ts

@@ -30,7 +30,8 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			ignoreScripts: {type: OptionType.Boolean },
 			tnsModulesVersion: { type: OptionType.String },
 			staticBindings: {type: OptionType.Boolean},
-			compileSdk: {type: OptionType.Number }
+			compileSdk: {type: OptionType.Number },
+			copyTo: { type: OptionType.String }
 		},
 		path.join($hostInfo.isWindows ? process.env.LocalAppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),
 			$errors, $staticConfig);

lib/services/android-project-service.ts

@@ -39,7 +39,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 	public get platformData(): IPlatformData {
 		if (!this._platformData) {
 			let projectRoot = path.join(this.$projectData.platformsDir, "android");
-
+			let packageName = this.getProjectNameFromId();
 			this._platformData = {
 				frameworkPackageName: "tns-android",
 				normalizedPlatformName: "Android",
@@ -49,6 +49,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 				projectRoot: projectRoot,
 				deviceBuildOutputPath: path.join(projectRoot, "build", "outputs", "apk"),
 				validPackageNamesForDevice: [
+					`${packageName}-debug.apk`,
+					`${packageName}-release.apk`,
 					`${this.$projectData.projectName}-debug.apk`,
 					`${this.$projectData.projectName}-release.apk`
 				],
@@ -143,11 +145,20 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 			shell.sed('-i', /__TITLE_ACTIVITY__/, this.$projectData.projectName, stringsFilePath);
 
 			let gradleSettingsFilePath = path.join(this.platformData.projectRoot, "settings.gradle");
-			shell.sed('-i', /__PROJECT_NAME__/, this.$projectData.projectId.split(".")[2], gradleSettingsFilePath);
+			shell.sed('-i', /__PROJECT_NAME__/, this.getProjectNameFromId(), gradleSettingsFilePath);
 			shell.sed('-i', /__APILEVEL__/, this.$options.sdk || this.$androidToolsInfo.getToolsInfo().wait().compileSdkVersion.toString(), manifestPath);
 		}).future<void>()();
 	}
 
+	private getProjectNameFromId(): string {
+		let id: string;
+		if(this.$projectData && this.$projectData.projectId) {
+			id = this.$projectData.projectId.split(".")[2];
+		}
+
+		return id;
+	}
+
 	public afterCreateProject(projectRoot: string): IFuture<void> {
 		return Future.fromResult();
 	}

lib/services/platform-service.ts

@@ -215,6 +215,33 @@ export class PlatformService implements IPlatformService {
 		}).future<void>()();
 	}
 
+	public copyLastOutput(platform: string, targetPath: string, settings: {isForDevice: boolean}): IFuture<void> {
+		return (() => {
+			let packageFile: string;
+			platform = platform.toLowerCase();
+			targetPath = path.resolve(targetPath);
+			let platformData = this.$platformsData.getPlatformData(platform);
+			if (settings.isForDevice) {
+				packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
+			} else {
+				packageFile = this.getLatestApplicationPackageForEmulator(platformData).wait().packageName;
+			}
+			if(!packageFile || !this.$fs.exists(packageFile).wait()) {
+				this.$errors.failWithoutHelp("Unable to find built application. Try 'tns build %s'.", platform);
+			}
+
+			this.$fs.ensureDirectoryExists(path.dirname(targetPath)).wait();
+
+			if(this.$fs.exists(targetPath).wait() && this.$fs.getFsStats(targetPath).wait().isDirectory()) {
+				let sourceFileName = path.basename(packageFile);
+				this.$logger.trace(`Specified target path: '${targetPath}' is directory. Same filename will be used: '${sourceFileName}'.`);
+				targetPath = path.join(targetPath, sourceFileName);
+			}
+			this.$fs.copyFile(packageFile, targetPath).wait();
+			this.$logger.info(`Copied file '${packageFile}' to '${targetPath}'.`);
+		}).future<void>()();
+	}
+
 	public runPlatform(platform: string, buildConfig?: IBuildConfig): IFuture<void> {
 		return (() => {
 			platform = platform.toLowerCase();