cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [23/50] [abbrv] android commit: Merge branch 'master' into 4.0.x (--minSdkVersion and --versionCode)
Date Wed, 28 Jan 2015 14:59:14 GMT
Merge branch 'master' into 4.0.x (--minSdkVersion and --versionCode)

Conflicts:
	bin/templates/project/build.gradle


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

Branch: refs/heads/master
Commit: 4f3ae23170d6b661f10b3f8a426534f12c35827e
Parents: a696ff3 7cfb33d
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Wed Dec 24 13:35:17 2014 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Wed Dec 24 13:35:39 2014 -0500

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js | 36 +++++++++++++++++++++++----------
 bin/templates/project/build.gradle | 17 +++++++++++++---
 2 files changed, 39 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4f3ae231/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --cc bin/templates/cordova/lib/build.js
index 005ba70,b507c5e..621d7d8
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@@ -445,12 -457,14 +457,14 @@@ module.exports.findBestApkForArchitectu
  };
  
  module.exports.help = function() {
-     console.log('Usage: ' + path.relative(process.cwd(), path.join(ROOT, 'cordova', 'build'))
+ ' [build_type]');
-     console.log('Build Types : ');
-     console.log('    \'--debug\': Default build, will build project in debug mode');
+     console.log('Usage: ' + path.relative(process.cwd(), path.join(ROOT, 'cordova', 'build'))
+ ' [flags]');
+     console.log('Flags:');
+     console.log('    \'--debug\': will build project in debug mode (default)');
      console.log('    \'--release\': will build project for release');
-     console.log('    \'--ant\': Default build, will build project with ant');
 -    console.log('    \'--ant\': will build project with ant (default)');
--    console.log('    \'--gradle\': will build project with gradle');
-     console.log('    \'--nobuild\': will skip build process (can be used with run command)');
++    console.log('    \'--ant\': will build project with ant');
++    console.log('    \'--gradle\': will build project with gradle (default)');
+     console.log('    \'--nobuild\': will skip build process (useful when using run command)');
+     console.log('    \'--versionCode=#\': Override versionCode for this build. Useful for
uploading multiple APKs. Requires --gradle.');
+     console.log('    \'--minSdkVersion=#\': Override minSdkVersion for this build. Useful
for uploading multiple APKs. Requires --gradle.');
      process.exit(0);
  };


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message