You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by js...@apache.org on 2015/02/03 19:57:57 UTC
[1/2] cordova-lib git commit: compile: line up requires
Repository: cordova-lib
Updated Branches:
refs/heads/master 74b8142c2 -> 0ee180cd1
compile: line up requires
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3ff9d79a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3ff9d79a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3ff9d79a
Branch: refs/heads/master
Commit: 3ff9d79a16fde2da5f93d73df28c65deacccd603
Parents: 74b8142
Author: Josh Soref <js...@blackberry.com>
Authored: Tue Feb 3 13:55:45 2015 -0500
Committer: Josh Soref <js...@blackberry.com>
Committed: Tue Feb 3 13:55:45 2015 -0500
----------------------------------------------------------------------
cordova-lib/src/cordova/compile.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3ff9d79a/cordova-lib/src/cordova/compile.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/compile.js b/cordova-lib/src/cordova/compile.js
index 1d0969c..3eb6612 100644
--- a/cordova-lib/src/cordova/compile.js
+++ b/cordova-lib/src/cordova/compile.js
@@ -19,8 +19,8 @@
var path = require('path'),
cordova_util = require('./util'),
- HooksRunner = require('../hooks/HooksRunner'),
- events = require('../events'),
+ HooksRunner = require('../hooks/HooksRunner'),
+ events = require('../events'),
superspawn = require('./superspawn');
// Returns a promise.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-lib git commit: CB-8409 compile: bubble failures
Posted by js...@apache.org.
CB-8409 compile: bubble failures
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/0ee180cd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/0ee180cd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/0ee180cd
Branch: refs/heads/master
Commit: 0ee180cd1d40b4c2da77d255000a578e12e0a449
Parents: 3ff9d79
Author: Josh Soref <js...@blackberry.com>
Authored: Tue Feb 3 13:56:16 2015 -0500
Committer: Josh Soref <js...@blackberry.com>
Committed: Tue Feb 3 13:56:16 2015 -0500
----------------------------------------------------------------------
cordova-lib/src/cordova/compile.js | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0ee180cd/cordova-lib/src/cordova/compile.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/compile.js b/cordova-lib/src/cordova/compile.js
index 3eb6612..616f262 100644
--- a/cordova-lib/src/cordova/compile.js
+++ b/cordova-lib/src/cordova/compile.js
@@ -21,6 +21,7 @@ var path = require('path'),
cordova_util = require('./util'),
HooksRunner = require('../hooks/HooksRunner'),
events = require('../events'),
+ Q = require('q'),
superspawn = require('./superspawn');
// Returns a promise.
@@ -40,6 +41,7 @@ module.exports = function compile(options) {
return hooksRunner.fire('after_compile', options);
}, function(error) {
events.emit('log', 'ERROR building one of the platforms: ' + error + '\nYou may not have the required environment or OS to build this project');
+ return Q.reject(error);
});
return ret;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org