cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [1/3] git commit: CB-5183 WP7/8 custom_path is not correctly resolved by CLI
Date Mon, 04 Nov 2013 19:35:18 GMT
Updated Branches:
  refs/heads/master 552995809 -> 48dee19cc


CB-5183 WP7/8 custom_path is not correctly resolved by CLI


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

Branch: refs/heads/master
Commit: 902a4aa928201620535bdc4ebacbd421663d34f1
Parents: 7c74aa5
Author: sgrebnov <sergei.grebnov@gmail.com>
Authored: Wed Oct 23 12:03:35 2013 +0400
Committer: sgrebnov <sergei.grebnov@gmail.com>
Committed: Wed Oct 23 12:03:35 2013 +0400

----------------------------------------------------------------------
 src/metadata/wp7_parser.js | 2 +-
 src/metadata/wp8_parser.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/902a4aa9/src/metadata/wp7_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp7_parser.js b/src/metadata/wp7_parser.js
index 9d7287c..fb94eac 100644
--- a/src/metadata/wp7_parser.js
+++ b/src/metadata/wp7_parser.js
@@ -50,7 +50,7 @@ module.exports.check_requirements = function(project_root) {
     events.emit('log', 'Checking wp7 requirements...');
     var lib_path = path.join(util.libDirectory, 'wp', 'cordova', require('../../platforms').wp7.version,
'wp7');
     var custom_path = config.has_custom_path(project_root, 'wp7');
-    if (custom_path) lib_path = custom_path;
+    if (custom_path) lib_path = path.join(custom_path, 'wp7');
     var command = '"' + path.join(lib_path, 'bin', 'check_reqs') + '"';
     events.emit('verbose', 'Running "' + command + '" (output to follow)');
     var d = Q.defer();

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/902a4aa9/src/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js
index 2274b7e..a647941 100644
--- a/src/metadata/wp8_parser.js
+++ b/src/metadata/wp8_parser.js
@@ -49,7 +49,7 @@ module.exports.check_requirements = function(project_root) {
     events.emit('log', 'Checking wp8 requirements...');
     var lib_path = path.join(util.libDirectory, 'wp', 'cordova', require('../../platforms').wp8.version,
'wp8');
     var custom_path = config.has_custom_path(project_root, 'wp8');
-    if (custom_path) lib_path = custom_path;
+    if (custom_path) lib_path = path.join(custom_path, 'wp8');
     var command = '"' + path.join(lib_path, 'bin', 'check_reqs') + '"';
     events.emit('verbose', 'Running "' + command + '" (output to follow)');
     var d = Q.defer();


Mime
View raw message