You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2015/03/03 21:04:44 UTC
cordova-cli git commit: [CB-8597] First attempt at importing
cordova-app-hello-world via npm dependency
Repository: cordova-cli
Updated Branches:
refs/heads/copy-from-app-hello-world [created] 4ed51ee66
[CB-8597] First attempt at importing cordova-app-hello-world via npm dependency
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/4ed51ee6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/4ed51ee6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/4ed51ee6
Branch: refs/heads/copy-from-app-hello-world
Commit: 4ed51ee6650e6ef80d8219139b893711b71a98e1
Parents: 0558788
Author: Michal Mocny <mm...@gmail.com>
Authored: Tue Mar 3 15:04:20 2015 -0500
Committer: Michal Mocny <mm...@gmail.com>
Committed: Tue Mar 3 15:04:20 2015 -0500
----------------------------------------------------------------------
package.json | 9 +++++----
src/cli.js | 16 +++++++++-------
2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4ed51ee6/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index b3b117a..5d4b41f 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,11 @@
"cli"
],
"dependencies": {
+ "cordova-app-hello-world": "file:../cordova-app-hello-world",
"cordova-lib": "4.3.0",
- "q": "1.0.1",
"nopt": "3.0.1",
- "underscore":"1.7.0"
+ "q": "1.0.1",
+ "underscore": "1.7.0"
},
"devDependencies": {
"istanbul": "^0.3.4",
@@ -135,8 +136,8 @@
"email": "stevengill97@gmail.com"
},
{
- "name":"Jesse",
- "email":"purplecabbage@gmail.com"
+ "name": "Jesse",
+ "email": "purplecabbage@gmail.com"
}
],
"license": "Apache version 2.0"
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4ed51ee6/src/cli.js
----------------------------------------------------------------------
diff --git a/src/cli.js b/src/cli.js
index 8f6f87a..a6cf586 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -260,14 +260,16 @@ function cli(inputArgs) {
if ( customWww.substr(0,1) === '~' ) { // resolve tilde in a naive way.
customWww = path.join(process.env.HOME, customWww.substr(1));
}
- customWww = path.resolve(customWww);
- var wwwCfg = { url: customWww };
- if (args['link-to']) {
- wwwCfg.link = true;
- }
- cfg.lib = cfg.lib || {};
- cfg.lib.www = wwwCfg;
+ } else {
+ customWww = path.join(__dirname, '..', 'node_modules', 'cordova-app-hello-world');
+ }
+ customWww = path.resolve(customWww);
+ var wwwCfg = { url: customWww };
+ if (args['link-to']) {
+ wwwCfg.link = true;
}
+ cfg.lib = cfg.lib || {};
+ cfg.lib.www = wwwCfg;
// create(dir, id, name, cfg)
cordova.raw.create( undashed[1] // dir to create the project in
, undashed[2] // App id
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org