Updated Branches: refs/heads/master2 026703add -> 1309777e4
Fixed up + updated support for windows phone Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/aff149df Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/aff149df Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/aff149df Branch: refs/heads/master2 Commit: aff149df5bdc273ccc71d288731ce202f8393add Parents: 026703a Author: Benn Mapes <[email protected]> Authored: Tue May 28 15:51:40 2013 -0700 Committer: Benn Mapes <[email protected]> Committed: Thu May 30 13:45:33 2013 -0700 ---------------------------------------------------------------------- src/emulate.js | 4 ++-- src/metadata/wp7_parser.js | 6 +----- src/metadata/wp8_parser.js | 6 +----- src/platform.js | 4 ++-- src/prepare.js | 6 +++++- 5 files changed, 11 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/aff149df/src/emulate.js ---------------------------------------------------------------------- diff --git a/src/emulate.js b/src/emulate.js index c3fad00..ffa1319 100644 --- a/src/emulate.js +++ b/src/emulate.js @@ -23,8 +23,8 @@ var cordova_util = require('./util'), android_parser = require('./metadata/android_parser'), ios_parser = require('./metadata/ios_parser'), blackberry_parser = require('./metadata/blackberry_parser'), - wp7_parser = require('./metadata/wp7_parser'), - wp8_parser = require('./metadata/wp8_parser'), + wp7_parser = require('./metadata/wp7_parser'), + wp8_parser = require('./metadata/wp8_parser'), platform = require('./platform'), fs = require('fs'), ls = fs.readdirSync, http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/aff149df/src/metadata/wp7_parser.js ---------------------------------------------------------------------- diff --git a/src/metadata/wp7_parser.js b/src/metadata/wp7_parser.js index b2586b4..a6a773a 100644 --- a/src/metadata/wp7_parser.js +++ b/src/metadata/wp7_parser.js @@ -139,10 +139,7 @@ module.exports.prototype = { shell.cp('-rf', project_www, this.wp7_proj_dir); // copy over wp7 lib's cordova.js - var raw_version = fs.readFileSync(path.join(util.libDirectory, 'cordova-wp7', 'VERSION'), 'utf-8') - var VERSION = raw_version.replace(/\r\n/,'').replace(/\n/,''); - //TODO : update to cordova.js for version 2.8.0 - var cordovajs_path = path.join(util.libDirectory, 'cordova-wp7', 'templates', 'standalone', 'www', 'cordova-' + VERSION + '.js'); + var cordovajs_path = path.join(util.libDirectory, 'cordova-wp7', 'templates', 'standalone', 'www', 'cordova.js'); fs.writeFileSync(path.join(this.www_dir(), 'cordova.js'), fs.readFileSync(cordovajs_path, 'utf-8'), 'utf-8'); }, @@ -173,4 +170,3 @@ module.exports.prototype = { if (callback) callback(); } }; - http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/aff149df/src/metadata/wp8_parser.js ---------------------------------------------------------------------- diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js index cd3698e..089b25b 100644 --- a/src/metadata/wp8_parser.js +++ b/src/metadata/wp8_parser.js @@ -139,10 +139,7 @@ module.exports.prototype = { shell.cp('-rf', project_www, this.wp8_proj_dir); // copy over wp8 lib's cordova.js - var raw_version = fs.readFileSync(path.join(util.libDirectory, 'cordova-wp8', 'VERSION'), 'utf-8') - var VERSION = raw_version.replace(/\r\n/,'').replace(/\n/,''); - //TODO : update to cordova.js for version 2.8.0 - var cordovajs_path = path.join(util.libDirectory, 'cordova-wp8', 'templates', 'standalone', 'www', 'cordova-' + VERSION + '.js'); + var cordovajs_path = path.join(util.libDirectory, 'cordova-wp8', 'templates', 'standalone', 'www', 'cordova.js'); fs.writeFileSync(path.join(this.www_dir(), 'cordova.js'), fs.readFileSync(cordovajs_path, 'utf-8'), 'utf-8'); }, @@ -173,4 +170,3 @@ module.exports.prototype = { if (callback) callback(); } }; - http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/aff149df/src/platform.js ---------------------------------------------------------------------- diff --git a/src/platform.js b/src/platform.js index e4bf539..5670f1b 100644 --- a/src/platform.js +++ b/src/platform.js @@ -26,8 +26,8 @@ var config_parser = require('./config_parser'), android_parser = require('./metadata/android_parser'), ios_parser = require('./metadata/ios_parser'), blackberry_parser = require('./metadata/blackberry_parser'), - wp7_parser = require('./metadata/wp7_parser'), - wp8_parser = require('./metadata/wp8_parser'), + wp7_parser = require('./metadata/wp7_parser'), + wp8_parser = require('./metadata/wp8_parser'), plugman = require('plugman'), shell = require('shelljs'); http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/aff149df/src/prepare.js ---------------------------------------------------------------------- diff --git a/src/prepare.js b/src/prepare.js index 570b29c..523d90b 100644 --- a/src/prepare.js +++ b/src/prepare.js @@ -26,6 +26,8 @@ var cordova_util = require('./util'), android_parser = require('./metadata/android_parser'), blackberry_parser = require('./metadata/blackberry_parser'), ios_parser = require('./metadata/ios_parser'), + wp7_parser = require('./metadata/wp7_parser'), + wp8_parser = require('./metadata/wp8_parser'), hooker = require('./hooker'), n = require('ncallbacks'), prompt = require('prompt'), @@ -35,7 +37,9 @@ var cordova_util = require('./util'), var parsers = { "android":android_parser, "ios":ios_parser, - "blackberry":blackberry_parser + "blackberry":blackberry_parser, + "wp7":wp7_parser, + "wp8":wp8_parser }; module.exports = function prepare(platforms, callback) {
