cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [11/51] [abbrv] git commit: Update parsers to match new libDir returned by lazy_load
Date Wed, 27 Nov 2013 22:27:10 GMT
Update parsers to match new libDir returned by lazy_load


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

Branch: refs/heads/fireos
Commit: abab971ed6d30460fb3474c784de9fcea6b7351f
Parents: 20faff1
Author: SomaticIT <contact@somatic.fr>
Authored: Thu Nov 14 22:07:06 2013 +0100
Committer: SomaticIT <contact@somatic.fr>
Committed: Thu Nov 14 22:07:06 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/abab971e/src/metadata/windows8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/windows8_parser.js b/src/metadata/windows8_parser.js
index dbddf30..968ba1c 100644
--- a/src/metadata/windows8_parser.js
+++ b/src/metadata/windows8_parser.js
@@ -146,7 +146,7 @@ module.exports.prototype = {
 
     // Used for creating platform_www in projects created by older versions.
     cordovajs_path:function(libDir) {
-        var jsPath = path.join(libDir, 'windows8', "template", 'www', 'cordova.js');
+        var jsPath = path.join(libDir, "template", 'www', 'cordova.js');
         return path.resolve(jsPath);
     },
 
@@ -249,8 +249,6 @@ module.exports.prototype = {
             return Q.reject(e);
         }
         // overrides (merges) are handled in 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/abab971e/src/metadata/wp7_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp7_parser.js b/src/metadata/wp7_parser.js
index 4cfb63d..55023aa 100644
--- a/src/metadata/wp7_parser.js
+++ b/src/metadata/wp7_parser.js
@@ -156,7 +156,7 @@ module.exports.prototype = {
 
     // Used for creating platform_www in projects created by older versions.
     cordovajs_path:function(libDir) {
-        var jsPath = path.join(libDir, 'common', 'www', 'cordova.js');
+        var jsPath = path.join(libDir, '..', 'common', 'www', 'cordova.js');
         return path.resolve(jsPath);
     },
 

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/abab971e/src/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js
index 401e3c7..39fc3f2 100644
--- a/src/metadata/wp8_parser.js
+++ b/src/metadata/wp8_parser.js
@@ -160,7 +160,7 @@ module.exports.prototype = {
 
     // Used for creating platform_www in projects created by older versions.
     cordovajs_path:function(libDir) {
-        var jsPath = path.join(libDir, 'common', 'www', 'cordova.js');
+        var jsPath = path.join(libDir, '..', 'common', 'www', 'cordova.js');
         return path.resolve(jsPath);
     },
 


Mime
View raw message