Merge pull request #113 from isleofcode/fix/default-output-path

Fix/default output path

Author: alexblom

docs/cli.md

@@ -41,6 +41,7 @@ Build the ember and cordova project together running in the simulator or on a de
 + environment (default:development)
 + platform (default:ios)
 + release (default: debug)
++ cordova-output-path (default: ember-cordova/cordova/www)
 
 #### Examples
 + `ember cordova:build`
@@ -101,6 +102,7 @@ here](livereload.md).
 #### Available options
 + platform (default:ios)
 + reloadUrl (default:localhost:4200)
++ cordova-output-path (default: ember-cordova/cordova/www)
 
 #### Examples
 + `ember cdv:serve`

lib/commands/build.js

@@ -23,7 +23,7 @@ module.exports = {
     { name: 'platform',             type: String,  default: 'ios' },
     { name: 'verbose',              type: Boolean, default: false,         aliases: ['v'] },
     { name: 'environment',          type: String,  default: 'development', aliases: ['e', 'env', { 'dev': 'development' }, { 'prod': 'production' }] },
-    { name: 'output-path',          type: 'Path',  default: 'ember-cordova/cordova/www',       aliases: ['op', 'out'] },
+    { name: 'cordova-output-path',  type: 'Path',  default: 'ember-cordova/cordova/www',       aliases: ['op', 'out'] },
     { name: 'release',              type: Boolean, default: false }
   ],
   /* eslint-enable max-len */
@@ -65,7 +65,7 @@ module.exports = {
       ui: ui,
       project: project,
       environment: options.environment,
-      outputPath: options.outputPath
+      outputPath: options.cordovaOutputPath
     });
 
     cordovaBuild = new CdvBuildTask({

lib/commands/serve.js

@@ -46,7 +46,7 @@ module.exports = {
     { name: 'live-reload-base-url', type: String,                          aliases: ['lrbu'],  description: 'Defaults to baseURL' },
     { name: 'live-reload-port',     type: Number,                          aliases: ['lrp'],   description: '(Defaults to port number within [49152...65535])' },
     { name: 'environment',          type: String,  default: 'development', aliases: ['e', 'env', { 'dev': 'development' }, { 'prod': 'production' }] },
-    { name: 'output-path',          type: 'Path',  default: 'ember-cordova/cordova/www/',       aliases: ['op', 'out'] },
+    { name: 'cordova-output-path',  type: 'Path',  default: 'ember-cordova/cordova/www/',       aliases: ['op', 'out'] },
     { name: 'ssl',                  type: Boolean, default: false },
     { name: 'ssl-key',              type: String,  default: 'ssl/server.key' },
     { name: 'ssl-cert',             type: String,  default: 'ssl/server.crt' }
@@ -104,7 +104,7 @@ module.exports = {
       ui: this.ui,
       project: this.project,
       environment: options.environment,
-      outputPath: options.outputPath
+      outputPath: options.cordovaOutputPath
     });
 
     cordovaBuild = new CdvBuildTask({

lib/tasks/ember-build-serve.js

@@ -20,7 +20,7 @@ module.exports = Task.extend({
   run: function(options) {
     var builder = new Builder({
       ui: this.ui,
-      outputPath: options.outputPath,
+      outputPath: options.cordovaOutputPath,
       project: this.project,
       environment: options.environment
     });