cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [1/2] git commit: CB-5183 WP7/8 lib path is not correctly resolved by CLI (additional changes)
Date Thu, 07 Nov 2013 01:10:03 GMT
Updated Branches:
  refs/heads/master 3d6a3d3fd -> f86273cdf


CB-5183 WP7/8 lib path is not correctly resolved by CLI (additional changes)


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

Branch: refs/heads/master
Commit: 181aa1b7e8f3c8b2f7c4db12e1f79d64c26e8b42
Parents: 733e637
Author: sgrebnov <sergei.grebnov@gmail.com>
Authored: Tue Nov 5 19:22:12 2013 +0400
Committer: sgrebnov <sergei.grebnov@gmail.com>
Committed: Tue Nov 5 19:22:22 2013 +0400

----------------------------------------------------------------------
 src/metadata/windows8_parser.js | 3 ++-
 src/metadata/wp8_parser.js      | 3 ++-
 src/platform.js                 | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/181aa1b7/src/metadata/windows8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/windows8_parser.js b/src/metadata/windows8_parser.js
index 68520fc..da64e03 100644
--- a/src/metadata/windows8_parser.js
+++ b/src/metadata/windows8_parser.js
@@ -239,7 +239,8 @@ module.exports.prototype = {
             return Q.reject(e);
         }
         // overrides (merges) are handled in update_www()
-        this.update_www();
+        var libDir = path.join(util.libDirectory, 'windows8', 'cordova', require('../../platforms').windows8.version);
+        this.update_www(libDir);
         this.update_staging();
         util.deleteSvnFolders(this.www_dir());
         return Q();

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/181aa1b7/src/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js
index 65fdb49..77b0a89 100644
--- a/src/metadata/wp8_parser.js
+++ b/src/metadata/wp8_parser.js
@@ -251,7 +251,8 @@ module.exports.prototype = {
             return Q.reject(e);
         }
         // overrides (merges) are handled in update_www()
-        this.update_www();
+        var libDir = path.join(util.libDirectory, 'wp', 'cordova', require('../../platforms').wp8.version);
+        this.update_www(libDir);
 
         // trigger an event in case anyone needs to modify the contents of the www folder
before we package it.
         var deferred = Q.defer();

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/181aa1b7/src/platform.js
----------------------------------------------------------------------
diff --git a/src/platform.js b/src/platform.js
index 65c533c..8800bc1 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -226,6 +226,10 @@ function call_into_create(target, projectRoot, cfg, libDir, template_dir)
{
         events.emit('verbose', 'Checking if platform "' + target + '" passes minimum requirements...');
         return module.exports.supports(projectRoot, target)
         .then(function() {
+            // CB-5183 WP7/8 path is not correctly resolved by CLI
+            if (target == 'wp7' || target == 'wp8' || target == 'windows8') {
+                libDir =  path.join(libDir, target);
+            }            
             // Create a platform app using the ./bin/create scripts that exist in each repo.
             // Run platform's create script
             var bin = path.join(libDir, 'bin', 'create');


Mime
View raw message