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 2014/08/20 22:41:34 UTC
[1/2] git commit: CB-7347 Improve cordova platform add /path/to
handling
Repository: cordova-lib
Updated Branches:
refs/heads/master 1a027d004 -> ed6c0a183
CB-7347 Improve cordova platform add /path/to handling
split name/path errors
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/ed6c0a18
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/ed6c0a18
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/ed6c0a18
Branch: refs/heads/master
Commit: ed6c0a183c53b29adb5ea19319cbdac99351b1a3
Parents: 8889c95
Author: Josh Soref <js...@blackberry.com>
Authored: Tue Aug 19 12:13:59 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
Committed: Wed Aug 20 16:39:55 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/cordova/platform.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/ed6c0a18/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js
index 7a01783..58e7f24 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -350,12 +350,16 @@ function platform(command, targets, opts) {
var pPath = path.resolve(t);
if (fs.existsSync(pPath)) return;
// Neither path, nor platform name - throw.
- var msg = 'Platform "' + t +
+ var msg;
+ if (/[~:/\\.]/.test(t)) {
+ msg = 'Platform path "' + t + '" not found.';
+ } else {
+ msg = 'Platform "' + t +
'" not recognized as a core cordova platform. See `' +
cordova_util.binname + ' platform list`.'
;
+ }
throw new CordovaError(msg);
-
});
} else if (command == 'add' || command == 'rm') {
msg = 'You need to qualify `add` or `remove` with one or more platforms!';
[2/2] git commit: CB-7118 (fix jshint warnings)
Posted by js...@apache.org.
CB-7118 (fix jshint warnings)
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/8889c954
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/8889c954
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/8889c954
Branch: refs/heads/master
Commit: 8889c954a87ebc189770abb601054d5824718a66
Parents: 1a027d0
Author: Josh Soref <js...@blackberry.com>
Authored: Wed Aug 20 16:39:47 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
Committed: Wed Aug 20 16:39:55 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/cordova/metadata/ios_parser.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/8889c954/cordova-lib/src/cordova/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/ios_parser.js b/cordova-lib/src/cordova/metadata/ios_parser.js
index 19b63e8..b853fab 100644
--- a/cordova-lib/src/cordova/metadata/ios_parser.js
+++ b/cordova-lib/src/cordova/metadata/ios_parser.js
@@ -264,9 +264,9 @@ function default_CFBundleVersion(version) {
// Converts cordova specific representation of target device to XCode value
function parseTargetDevicePreference(value) {
if (!value) return null;
- var map = { 'universal': '"1,2"', 'handset': '"1"', 'tablet': '"2"'}
+ var map = { 'universal': '"1,2"', 'handset': '"1"', 'tablet': '"2"'};
if (map[value.toLowerCase()]) {
- return map[value.toLowerCase()]
+ return map[value.toLowerCase()];
}
events.emit('warn', 'Unknown target-device preference value: "' + value + '".');
return null;