From d1cc240a4f33c5970f67b3e76f9d17916820dfe7 Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Wed, 11 Mar 2015 14:20:04 +0200 Subject: [PATCH 1/4] Prepare platform only once - when building --- lib/services/platform-service.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts index 6f44946680..7cd98bb23b 100644 --- a/lib/services/platform-service.ts +++ b/lib/services/platform-service.ts @@ -178,7 +178,6 @@ export class PlatformService implements IPlatformService { return (() => { platform = platform.toLowerCase(); - this.preparePlatform(platform).wait(); if (options.emulator) { this.deployOnEmulator(platform).wait(); } else { @@ -215,8 +214,6 @@ export class PlatformService implements IPlatformService { var platformData = this.$platformsData.getPlatformData(platform); if (options["debug-brk"]) { - this.preparePlatform(platform).wait(); - var cachedDeviceOption = options.forDevice; options.forDevice = true; this.buildPlatform(platform).wait(); From ae1ea4167e49578b5d3c327907229f708f52c062 Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Wed, 11 Mar 2015 14:21:00 +0200 Subject: [PATCH 2/4] Remove duplicated getPlatformData --- lib/services/platform-service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts index 7cd98bb23b..4730d391b8 100644 --- a/lib/services/platform-service.ts +++ b/lib/services/platform-service.ts @@ -209,7 +209,6 @@ export class PlatformService implements IPlatformService { public debugOnDevice(platform: string): IFuture { return (() => { platform = platform.toLowerCase(); - var platformData = this.$platformsData.getPlatformData(platform); var packageFile = ""; var platformData = this.$platformsData.getPlatformData(platform); From 84ceb3745976606c7967aa1678ae9c6d552b0f38 Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Wed, 11 Mar 2015 15:26:36 +0200 Subject: [PATCH 3/4] Run application on device after deploying it --- lib/services/platform-service.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts index 4730d391b8..963ea34555 100644 --- a/lib/services/platform-service.ts +++ b/lib/services/platform-service.ts @@ -193,7 +193,7 @@ export class PlatformService implements IPlatformService { ? this.debugOnEmulator(platform) : this.debugOnDevice(platform); - return ret; + return ret; } public debugOnEmulator(platform: string): IFuture { @@ -272,7 +272,13 @@ export class PlatformService implements IPlatformService { this.$logger.out("Using ", packageFile); this.$devicesServices.initialize({platform: platform, deviceId: options.device}).wait(); - var action = (device: Mobile.IDevice): IFuture => { return device.deploy(packageFile, this.$projectData.projectId); }; + var action = (device: Mobile.IDevice): IFuture => { + return (() => { + device.deploy(packageFile, this.$projectData.projectId).wait(); + device.runApplication(this.$projectData.projectId).wait(); + + }).future()(); + }; this.$devicesServices.execute(action).wait(); }).future()(); From d216e29729546a88c626983ee6887c7d00b6a4be Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Wed, 11 Mar 2015 17:59:34 +0200 Subject: [PATCH 4/4] Add warning when image signature is incompatible with device --- lib/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common b/lib/common index 0a554b1dbc..1687c9925d 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit 0a554b1dbc3f29fa6e229aabfa444d59a4ea6ce2 +Subproject commit 1687c9925db6fbd444fc5c21cfe8b511013d6292