cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [06/10] git commit: fix merge conflicts
Date Wed, 27 Nov 2013 20:11:28 GMT
fix merge conflicts


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

Branch: refs/heads/master
Commit: 4e7def9181e891516af19ecd3d412fca1be03cba
Parents: 5977d74 372e598
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Tue Nov 26 13:47:55 2013 -0800
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Tue Nov 26 13:47:55 2013 -0800

----------------------------------------------------------------------
 platforms.js                          | 12 ++++++++----
 spec/metadata/windows8_parser.spec.js |  5 -----
 spec/platform.spec.js                 |  4 ++--
 src/lazy_load.js                      | 15 ++++++++++-----
 src/metadata/windows8_parser.js       |  5 +----
 src/metadata/wp7_parser.js            |  2 +-
 src/metadata/wp8_parser.js            |  2 +-
 src/platform.js                       |  8 --------
 8 files changed, 23 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4e7def91/platforms.js
----------------------------------------------------------------------
diff --cc platforms.js
index 5afb91a,1e439c0..370d056
--- a/platforms.js
+++ b/platforms.js
@@@ -31,17 -31,20 +31,20 @@@ module.exports = 
      'wp7' : {
          parser : './src/metadata/wp7_parser',
          url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git',
-         version: '3.2.0'
 -        version: '3.2.0-rc1',
++        version: '3.2.0',
+         subdirectory: 'wp7'
      },
      'wp8' : {
          parser : './src/metadata/wp8_parser',
          url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git',
-         version: '3.2.0'
 -        version: '3.2.0-rc1',
++        version: '3.2.0',
+         subdirectory: 'wp8'
      },
      'blackberry10' : {
          parser : './src/metadata/blackberry10_parser',
          url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-blackberry.git',
-         version: '3.2.0'
 -        version: '3.2.0-rc1',
++        version: '3.2.0',
+         subdirectory: 'blackberry10'
      },
      'www':{
          url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-app-hello-world.git',
@@@ -55,7 -58,8 +58,8 @@@
      'windows8':{
          parser: './src/metadata/windows8_parser',
          url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git',
-         version: '3.2.0'
 -        version: '3.2.0-rc1',
++        version: '3.2.0',
+         subdirectory: 'windows8'
      }
  };
  

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4e7def91/src/metadata/windows8_parser.js
----------------------------------------------------------------------
diff --cc src/metadata/windows8_parser.js
index bcbee53,968ba1c..bc41d34
--- a/src/metadata/windows8_parser.js
+++ b/src/metadata/windows8_parser.js
@@@ -287,42 -249,8 +287,39 @@@ module.exports.prototype = 
              return Q.reject(e);
          }
          // overrides (merges) are handled in update_www()
-         // CB-5340 Windows8 build does no write cordova_plugins.js
-         //var libDir = path.join(util.libDirectory, 'windows8', 'cordova', require('../../platforms').windows8.version);
-         //this.update_www(libDir);
          this.update_staging();
 +        this.add_bom();
 +
          util.deleteSvnFolders(this.www_dir());
          return Q();
 -    }
 +    },
 +
 +    // Adjust version number as per CB-5337 Windows8 build fails due to invalid app version
       
 +    fixConfigVersion: function (version) {
 +        var numVersionComponents = version.match(/\./g).length + 1;
 +        while (numVersionComponents++ < 4) {
 +            version += '.0';
 +        }
 +        return version;
 +    },
 +
 +    // CB-5421 Add BOM to all html, js, css files to ensure app can pass Windows Store Certification
 +    add_bom: function () {
 +        var www = this.www_dir();
 +        var files = shell.ls('-R', www);
 +
 +        files.forEach(function (file) {
 +            if (!file.match(/\.(js|html|css|json)/)) {
 +                return;
 +            }
 +
 +            var filePath = path.join(www, file);
 +            var content = fs.readFileSync(filePath);
 +
 +            if (content[0] !== 0xEF && content[1] !== 0xBE && content[2]
!== 0xBB) {
 +                fs.writeFileSync(filePath, '\ufeff' + content);
 +            }
 +        });
 +  	}
 +
  };

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4e7def91/src/metadata/wp7_parser.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4e7def91/src/metadata/wp8_parser.js
----------------------------------------------------------------------


Mime
View raw message