You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/12/06 02:13:22 UTC
[06/32] git commit: CB-5501 fix blackberry10 platform
CB-5501 fix blackberry10 platform
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/f7a35b3c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/f7a35b3c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/f7a35b3c
Branch: refs/heads/fireos
Commit: f7a35b3ca8a8b787fbbe01aebed286802451b64a
Parents: 758d752
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Thu Nov 28 14:34:13 2013 -0500
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Thu Nov 28 14:35:00 2013 -0500
----------------------------------------------------------------------
src/lazy_load.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f7a35b3c/src/lazy_load.js
----------------------------------------------------------------------
diff --git a/src/lazy_load.js b/src/lazy_load.js
index e16dd70..dcaa126 100644
--- a/src/lazy_load.js
+++ b/src/lazy_load.js
@@ -47,7 +47,7 @@ module.exports = {
var download_dir = (platform == 'wp7' || platform == 'wp8' ? path.join(util.libDirectory, 'wp', id, version) :
path.join(util.libDirectory, platform, id, version));
- var lib_dir = platforms[platform] && platforms[platform].subdirectory ? path.join(download_dir, platforms[platform].subdirectory) : download_dir;
+ var lib_dir = platforms[platform] && platforms[platform].subdirectory && platform !== "blackberry10" ? path.join(download_dir, platforms[platform].subdirectory) : download_dir;
if (fs.existsSync(download_dir)) {
events.emit('verbose', id + ' library for "' + platform + '" already exists. No need to download. Continuing.');
@@ -102,7 +102,7 @@ module.exports = {
events.emit('log', 'Download complete');
var entries = fs.readdirSync(download_dir);
var entry = path.join(download_dir, entries[0]);
- shell.mv('-f', path.join(entry, '*'), download_dir);
+ shell.mv('-f', path.join(entry, (platform=='blackberry10'?'blackberry10':''), '*'), download_dir);
shell.rm('-rf', entry);
d.resolve(hooker.fire('after_library_download', {
platform:platform,