You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2013/10/15 20:50:26 UTC
git commit: CB-4774: Copy www assets before running plugin prepare
Updated Branches:
refs/heads/master 9fc761f2f -> d1c802424
CB-4774: Copy www assets before running plugin prepare
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/d1c80242
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/d1c80242
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/d1c80242
Branch: refs/heads/master
Commit: d1c8024249b686d2796405169ad5ed788a4876ff
Parents: 9fc761f
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Oct 11 22:31:16 2013 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Tue Oct 15 14:49:42 2013 -0400
----------------------------------------------------------------------
src/metadata/android_parser.js | 1 -
src/metadata/blackberry10_parser.js | 1 -
src/metadata/firefoxos_parser.js | 2 --
src/metadata/ios_parser.js | 1 -
src/metadata/wp7_parser.js | 1 -
src/metadata/wp8_parser.js | 1 -
src/prepare.js | 3 +++
7 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d1c80242/src/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/android_parser.js b/src/metadata/android_parser.js
index 2df37e6..cb4bbb0 100644
--- a/src/metadata/android_parser.js
+++ b/src/metadata/android_parser.js
@@ -178,7 +178,6 @@ module.exports.prototype = {
} catch(e) {
return Q.reject(e);
}
- this.update_www();
this.update_overrides();
this.update_staging();
// delete any .svn folders copied over
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d1c80242/src/metadata/blackberry10_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/blackberry10_parser.js b/src/metadata/blackberry10_parser.js
index 5ad4f0b..da8c40e 100644
--- a/src/metadata/blackberry10_parser.js
+++ b/src/metadata/blackberry10_parser.js
@@ -64,7 +64,6 @@ module.exports.prototype = {
} catch(e) {
return Q.reject(e);
}
- self.update_www();
self.update_overrides();
self.update_staging();
util.deleteSvnFolders(this.www_dir());
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d1c80242/src/metadata/firefoxos_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/firefoxos_parser.js b/src/metadata/firefoxos_parser.js
index df6cd1e..31cd01f 100644
--- a/src/metadata/firefoxos_parser.js
+++ b/src/metadata/firefoxos_parser.js
@@ -115,8 +115,6 @@ module.exports.prototype = {
// Returns a promise.
update_project: function(cfg) {
- this.update_www();
-
return this.update_from_config(cfg)
.then(function(){
this.update_overrides();
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d1c80242/src/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/ios_parser.js b/src/metadata/ios_parser.js
index 15854e8..f552227 100644
--- a/src/metadata/ios_parser.js
+++ b/src/metadata/ios_parser.js
@@ -200,7 +200,6 @@ module.exports.prototype = {
var self = this;
return this.update_from_config(cfg)
.then(function() {
- self.update_www();
self.update_overrides();
self.update_staging();
util.deleteSvnFolders(self.www_dir());
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d1c80242/src/metadata/wp7_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp7_parser.js b/src/metadata/wp7_parser.js
index 5bda771..9d7287c 100644
--- a/src/metadata/wp7_parser.js
+++ b/src/metadata/wp7_parser.js
@@ -248,7 +248,6 @@ module.exports.prototype = {
} catch(e) {
return Q.reject(e);
}
- this.update_www();
// trigger an event in case anyone needs to modify the contents of the www folder before we package it.
var projectRoot = util.isCordova(process.cwd());
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d1c80242/src/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js
index ad914b6..2274b7e 100644
--- a/src/metadata/wp8_parser.js
+++ b/src/metadata/wp8_parser.js
@@ -253,7 +253,6 @@ module.exports.prototype = {
return Q.reject(e);
}
// overrides (merges) are handled in update_www()
- this.update_www();
this.update_staging();
util.deleteSvnFolders(this.www_dir());
return Q();
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d1c80242/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 6a4650b..738445c 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -84,6 +84,9 @@ module.exports = function prepare(options) {
}
}
+ // Replace the existing web assets with the app master versions
+ parser.update_www();
+
// Call plugman --prepare for this platform. sets up js-modules appropriately.
var plugins_dir = path.join(projectRoot, 'plugins');
events.emit('verbose', 'Calling plugman.prepare for platform "' + platform + '"');