github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Abort followup tasks if Cordova project creation doesn't succeed

Browse Source
This commit is contained in:
Martijn Walraven
2016-01-13 11:51:31 +01:00
parent 7a2e6de78e
commit b05cd35577
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/cli/commands-cordova.js
View File

@@ -53,6 +53,7 @@ main.registerCommand({
}
const cordovaProject = new CordovaProject(projectContext);
if (buildmessage.jobHasMessages()) return;
installedPlatforms = installedPlatforms.concat(platformsToAdd)
const cordovaPlatforms = cordova.filterPlatforms(installedPlatforms);
@@ -109,6 +110,7 @@ version of Meteor`);
if (process.platform !== 'win32') {
const cordovaProject = new CordovaProject(projectContext);
if (buildmessage.jobHasMessages()) return;
const cordovaPlatforms = cordova.filterPlatforms(installedPlatforms);
cordovaProject.ensurePlatformsAreSynchronized(cordovaPlatforms);
}

3
tools/cli/commands.js
View File

@@ -348,6 +348,7 @@ function doRunCommand(options) {
const cordovaProject = new CordovaProject(projectContext, {
settingsFile: options.settings,
mobileServerUrl: utils.formatUrl(parsedMobileServerUrl) });
if (buildmessage.jobHasMessages()) return;
cordovaRunner = new CordovaRunner(cordovaProject, runTargets);
cordovaRunner.checkPlatformsForRunTargets();
@@ -964,6 +965,7 @@ on an OS X system.");
cordovaProject = new CordovaProject(projectContext, {
settingsFile: options.settings,
mobileServerUrl: utils.formatUrl(parsedMobileServerUrl) });
if (buildmessage.jobHasMessages()) return;
const plugins = cordova.pluginVersionsFromStarManifest(
bundleResult.starManifest);
@@ -1580,6 +1582,7 @@ main.registerCommand({
const cordovaProject = new CordovaProject(projectContext, {
settingsFile: options.settings,
mobileServerUrl: utils.formatUrl(parsedMobileServerUrl) });
if (buildmessage.jobHasMessages()) return;
cordovaRunner = new CordovaRunner(cordovaProject, runTargets);
projectContext.platformList.write(cordovaRunner.platformsForRunTargets);