You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2013/05/23 23:58:42 UTC
[45/50] git commit: Fix up all hardcoded paths to the www dir in
favour of the util helpers
Fix up all hardcoded paths to the www dir in favour of the util helpers
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/01811ca4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/01811ca4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/01811ca4
Branch: refs/heads/master2
Commit: 01811ca454e7aff7c49041ae0577e75f387f0eb7
Parents: 0584e17
Author: Braden Shepherdson <br...@gmail.com>
Authored: Thu May 23 16:50:40 2013 -0400
Committer: Braden Shepherdson <br...@gmail.com>
Committed: Thu May 23 16:50:40 2013 -0400
----------------------------------------------------------------------
src/serve.js | 28 ++++++++++------------------
src/util.js | 3 +++
2 files changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/01811ca4/src/serve.js
----------------------------------------------------------------------
diff --git a/src/serve.js b/src/serve.js
index 2829847..e7eb42b 100644
--- a/src/serve.js
+++ b/src/serve.js
@@ -21,14 +21,18 @@ var cordova_util = require('./util'),
path = require('path'),
shell = require('shelljs'),
config_parser = require('./config_parser'),
- android_parser = require('./metadata/android_parser'),
- ios_parser = require('./metadata/ios_parser'),
- blackberry_parser = require('./metadata/blackberry_parser'),
fs = require('fs'),
util = require('util'),
http = require("http"),
url = require("url");
+var parsers = {
+ 'android': require('./metadata/android_parser'),
+ 'ios': require('./metadata/ios_parser'),
+ 'blackberry': require('./metadata/blackberry_parser'),
+ 'wp7': require('./metadata/wp7_parser'),
+ 'wp8': require('./metadata/wp8_parser')
+};
function launch_server(www, platform_www, config_xml_path, port) {
port = port || 8000;
@@ -123,21 +127,9 @@ module.exports.config = function (platform, port, callback) {
};
// Top-level www directory.
- result.paths.push(projectRoot + path.sep + 'www');
-
- var parser;
-
- switch (platform) {
- case 'android':
- parser = new android_parser(path.join(projectRoot, 'platforms', platform));
- break;
- case 'blackberry-10':
- parser = new blackberry_parser(path.join(projectRoot, 'platforms', platform));
- break;
- case 'ios':
- parser = new ios_parser(path.join(projectRoot, 'platforms', platform));
- break;
- }
+ result.paths.push(cordova_util.projectWww(projectRoot));
+
+ var parser = parsers[platform](path.join(projectRoot, 'platforms', platform));
// Update the related platform project from the config
parser.update_project(cfg, function() {
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/01811ca4/src/util.js
----------------------------------------------------------------------
diff --git a/src/util.js b/src/util.js
index cd34533..9b725a4 100644
--- a/src/util.js
+++ b/src/util.js
@@ -77,6 +77,9 @@ module.exports = {
return plugins;
},
+ appDir: function(projectDir) {
+ return projectDir;
+ },
projectWww: function(projectDir) {
return path.join(projectDir, 'www');
},