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

More logging, propagate the 'USE_GLOBAL_ADK' env variable

Browse Source
This commit is contained in:
Slava Kim
2014-08-28 17:10:03 -07:00
parent 81e216c599
commit 5de5ba462b
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/commands-cordova.js
View File

@@ -49,16 +49,17 @@ var verboseLog = cordova.verboseLog = function (/* args */) {
var execFileAsyncOrThrow = function (file, args, opts, cb) {
verboseLog('Running asynchronously: ', file, args);
if (_.isFunction(opts)) {
cb = opts;
opts = undefined;
}
// XXX a hack to always tell the scripts where warehouse is
if (opts) opts.env = _.extend({ "WAREHOUSE_DIR": tropo.root }, opts.env);
if (opts) opts.env = _.extend({ "WAREHOUSE_DIR": tropo.root, "USE_GLOBAL_ADK": process.env.USE_GLOBAL_ADK }, opts.env);
var execFileAsync = require('./utils.js').execFileAsync;
if (_.contains([localCordova, localAdb], file) &&
if (_.contains([localAdb, localAndroid], file) &&
_.contains(project.getCordovaPlatforms(), 'android'))
ensureAndroidBundle();
@@ -77,21 +78,25 @@ var execFileAsyncOrThrow = function (file, args, opts, cb) {
var execFileSyncOrThrow = function (file, args, opts) {
var execFileSync = require('./utils.js').execFileSync;
if (_.contains([localCordova, localAdb], file) &&
if (_.contains([localAdb, localAndroid], file) &&
_.contains(project.getCordovaPlatforms(), 'android')) {
ensureAndroidBundle();
}
// XXX a hack to always tell the scripts where warehouse is
if (opts) opts.env = _.extend({ "WAREHOUSE_DIR": tropo.root }, opts.env);
verboseLog('Running synchronously: ', file, args);
var process = execFileSync(file, args, opts);
if (! process.success)
throw new Error(process.stderr + '\n\n' + process.stdout);
return process;
// XXX a hack to always tell the scripts where warehouse is
if (opts) opts.env = _.extend({ "WAREHOUSE_DIR": tropo.root, "USE_GLOBAL_ADK": process.env.USE_GLOBAL_ADK }, opts.env);
var childProcess = execFileSync(file, args, opts);
if (! childProcess.success)
throw new Error('Failed to run ' + file + '\n' + childProcess.stderr + '\n\n' + childProcess.stdout);
return childProcess;
};
var ensureAndroidBundle = function () {
verboseLog('Ensuring android_bundle');
var ensureScriptPath =
path.join(files.getCurrentToolsDir(), 'tools', 'cordova-scripts',
'ensure_android_bundle.sh');
@@ -99,7 +104,8 @@ var ensureAndroidBundle = function () {
try {
execFileSyncOrThrow('bash', [ensureScriptPath], { pipeOutput: true });
} catch (err) {
process.exit();
verboseLog('Failed to install android_bundle: ', err.stack);
throw new Error('Failed to install android_bundle: ' + err.message);
}
};