cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bra...@apache.org
Subject git commit: CB-5063: Revert to copying cordova.js before user www dir
Date Fri, 08 Nov 2013 18:40:01 GMT
Updated Branches:
  refs/heads/master f6b3da947 -> 36cf660bc


CB-5063: Revert to copying cordova.js before user www dir


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

Branch: refs/heads/master
Commit: 36cf660bcdf2a79461ab6e2fc68b065225a2af8a
Parents: f6b3da9
Author: Mark Koudritsky <kamrik@chromium.org>
Authored: Fri Nov 8 12:37:53 2013 -0500
Committer: Braden Shepherdson <braden.shepherdson@gmail.com>
Committed: Fri Nov 8 13:39:49 2013 -0500

----------------------------------------------------------------------
 src/metadata/android_parser.js      | 4 ++--
 src/metadata/blackberry10_parser.js | 4 ++--
 src/metadata/firefoxos_parser.js    | 4 ++--
 src/metadata/ios_parser.js          | 4 ++--
 src/metadata/windows8_parser.js     | 4 ++--
 src/metadata/wp7_parser.js          | 4 ++--
 src/metadata/wp8_parser.js          | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/36cf660b/src/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/android_parser.js b/src/metadata/android_parser.js
index 56150c4..535d5b2 100644
--- a/src/metadata/android_parser.js
+++ b/src/metadata/android_parser.js
@@ -156,10 +156,10 @@ module.exports.prototype = {
         // Clear the www dir
         shell.rm('-rf', this.www_dir());
         shell.mkdir(this.www_dir());
-        // Copy over stock platform www assets (cordova.js)
-        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         // Copy over all app www assets
         shell.cp('-rf', path.join(app_www, '*'), this.www_dir());
+        // Copy over stock platform www assets (cordova.js)
+        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
     },
 
     // update the overrides folder into the www folder

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/36cf660b/src/metadata/blackberry10_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/blackberry10_parser.js b/src/metadata/blackberry10_parser.js
index 5d1faa5..84eb915 100644
--- a/src/metadata/blackberry10_parser.js
+++ b/src/metadata/blackberry10_parser.js
@@ -99,10 +99,10 @@ module.exports.prototype = {
         // Clear the www dir
         shell.rm('-rf', this.www_dir());
         shell.mkdir(this.www_dir());
-        // Copy over stock platform www assets (cordova.js)
-        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         // Copy over all app www assets
         shell.cp('-rf', path.join(app_www, '*'), this.www_dir());
+        // Copy over stock platform www assets (cordova.js)
+        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         //Re-Write config.xml
         platform_cfg_backup.update();
     },

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/36cf660b/src/metadata/firefoxos_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/firefoxos_parser.js b/src/metadata/firefoxos_parser.js
index 6c89da1..d58fc7e 100644
--- a/src/metadata/firefoxos_parser.js
+++ b/src/metadata/firefoxos_parser.js
@@ -85,10 +85,10 @@ module.exports.prototype = {
         // Clear the www dir
         shell.rm('-rf', this.www_dir());
         shell.mkdir(this.www_dir());
-        // Copy over stock platform www assets (cordova.js)
-        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         // Copy over all app www assets
         shell.cp('-rf', path.join(app_www, '*'), this.www_dir());
+        // Copy over stock platform www assets (cordova.js)
+        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
     },
 
     update_overrides: function() {

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/36cf660b/src/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/ios_parser.js b/src/metadata/ios_parser.js
index c590ec8..07a5e7b 100644
--- a/src/metadata/ios_parser.js
+++ b/src/metadata/ios_parser.js
@@ -172,10 +172,10 @@ module.exports.prototype = {
         // Clear the www dir
         shell.rm('-rf', this.www_dir());
         shell.mkdir(this.www_dir());
-        // Copy over stock platform www assets (cordova.js)
-        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         // Copy over all app www assets
         shell.cp('-rf', path.join(app_www, '*'), this.www_dir());
+        // Copy over stock platform www assets (cordova.js)
+        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
     },
 
     // update the overrides folder into the www folder

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/36cf660b/src/metadata/windows8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/windows8_parser.js b/src/metadata/windows8_parser.js
index 9b3a82a..dbddf30 100644
--- a/src/metadata/windows8_parser.js
+++ b/src/metadata/windows8_parser.js
@@ -159,14 +159,14 @@ module.exports.prototype = {
         // Clear the www dir
         shell.rm('-rf', this.www_dir());
         shell.mkdir(this.www_dir());
-        // Copy over stock platform www assets (cordova.js)
-        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         // Copy over all app www assets
         shell.cp('-rf', path.join(app_www, '*'), this.www_dir());
 
         // Copy all files from merges directory.
         this.copy_merges('windows8');
 
+        // Copy over stock platform www assets (cordova.js)
+        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         this.update_jsproj();
     },
 

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/36cf660b/src/metadata/wp7_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp7_parser.js b/src/metadata/wp7_parser.js
index 991e042..4cfb63d 100644
--- a/src/metadata/wp7_parser.js
+++ b/src/metadata/wp7_parser.js
@@ -169,14 +169,14 @@ module.exports.prototype = {
         // Clear the www dir
         shell.rm('-rf', this.www_dir());
         shell.mkdir(this.www_dir());
-        // Copy over stock platform www assets (cordova.js)
-        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         // Copy over all app www assets
         shell.cp('-rf', path.join(app_www, '*'), this.www_dir());
 
         // Copy all files from merges directories - wp generic first, then wp7 specific.
         this.copy_merges('wp');
         this.copy_merges('wp7');
+        // Copy over stock platform www assets (cordova.js)
+        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
     },
 
     // updates the csproj file to explicitly list all www content.

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/36cf660b/src/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js
index 77ce4de..401e3c7 100644
--- a/src/metadata/wp8_parser.js
+++ b/src/metadata/wp8_parser.js
@@ -173,8 +173,6 @@ module.exports.prototype = {
         // Clear the www dir
         shell.rm('-rf', this.www_dir());
         shell.mkdir(this.www_dir());
-        // Copy over stock platform www assets (cordova.js)
-        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         // Copy over all app www assets
         shell.cp('-rf', path.join(app_www, '*'), this.www_dir());
 
@@ -182,6 +180,8 @@ module.exports.prototype = {
         this.copy_merges('wp');
         this.copy_merges('wp8');
 
+        // Copy over stock platform www assets (cordova.js)
+        shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
         this.update_csproj();
     },
 


Mime
View raw message