Skip to content

Install tns-android before we invoke the before prepare hook #2541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2017
Merged

Install tns-android before we invoke the before prepare hook #2541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/services/platform-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ export class PlatformService implements IPlatformService {
});
}

this.ensurePlatformInstalled(platform).wait();
return this.preparePlatformCore(platform).wait();
}).future<boolean>()();
}
Expand All @@ -232,7 +233,6 @@ export class PlatformService implements IPlatformService {
private preparePlatformCore(platform: string): IFuture<boolean> {
return (() => {
platform = platform.toLowerCase();
this.ensurePlatformInstalled(platform).wait();

let platformData = this.$platformsData.getPlatformData(platform);
platformData.platformProjectService.ensureConfigurationFileInAppResources().wait();
Expand Down Expand Up @@ -322,7 +322,7 @@ export class PlatformService implements IPlatformService {
// Replace placeholders in configuration files
platformData.platformProjectService.interpolateConfigurationFile().wait();

this.$logger.out("Project successfully prepared ("+platform+")");
this.$logger.out("Project successfully prepared (" + platform + ")");
return true;
}).future<boolean>()();
}
Expand All @@ -337,14 +337,14 @@ export class PlatformService implements IPlatformService {
}

public prepareAndExecute(platform: string, executeAction: () => IFuture<void>): IFuture<void> {
return (() => {
platform = platform.toLowerCase();
if (!this.preparePlatform(platform).wait()) {
this.$errors.failWithoutHelp("Verify that listed files are well-formed and try again the operation.");
}
executeAction().wait();
}).future<void>()();
}
return (() => {
platform = platform.toLowerCase();
if (!this.preparePlatform(platform).wait()) {
this.$errors.failWithoutHelp("Verify that listed files are well-formed and try again the operation.");
}
executeAction().wait();
}).future<void>()();
}

public buildForDeploy(platform: string, buildConfig?: IBuildConfig): IFuture<void> {
return (() => {
Expand Down