cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject git commit: CB-5362 blackberry parser: support local cordova-blackberry
Date Fri, 06 Dec 2013 03:15:34 GMT
Updated Branches:
  refs/heads/master aaa59c340 -> 3e143be07


CB-5362 blackberry parser: support local cordova-blackberry

In a project directory:
.cordova/config.json:
{
  "lib": {
    "blackberry10": {
      "uri": "/path/to/cordova-blackberry/blackberry10",
      "version: "dev",
      "id": "blackberry10"
    }
  }
}


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/3e143be0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/3e143be0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/3e143be0

Branch: refs/heads/master
Commit: 3e143be0768c3431b9193d5458f904114c9e793a
Parents: aaa59c3
Author: Josh Soref <jsoref@blackberry.com>
Authored: Tue Nov 12 16:30:09 2013 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Dec 5 22:15:12 2013 -0500

----------------------------------------------------------------------
 src/metadata/blackberry10_parser.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/3e143be0/src/metadata/blackberry10_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/blackberry10_parser.js b/src/metadata/blackberry10_parser.js
index 84eb915..b5b8731 100644
--- a/src/metadata/blackberry10_parser.js
+++ b/src/metadata/blackberry10_parser.js
@@ -37,7 +37,13 @@ module.exports = function blackberry_parser(project) {
 
 // Returns a promise.
 module.exports.check_requirements = function(project_root) {
-    var lib_path = path.join(util.libDirectory, 'blackberry10', 'cordova', require('../../platforms').blackberry10.version);
+    var custom_path = config.has_custom_path(project_root, 'blackberry10');
+    var lib_path;
+    if (custom_path) {
+        lib_path = path.resolve(custom_path);
+    } else {
+        lib_path = path.join(util.libDirectory, 'blackberry10', 'cordova', require('../../platforms').blackberry10.version);
+    }
     var d = Q.defer();
     child_process.exec("\"" + path.join(lib_path, 'bin', 'check_reqs') + "\"", function(err,
output, stderr) {
         if (err) {


Mime
View raw message