You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/09/16 20:15:04 UTC
[1/3] android commit: CB-7512 Speed up gradle builds by building
debug or release (not both)
Repository: cordova-android
Updated Branches:
refs/heads/4.0.x 8f27b2ab5 -> 6eb4409a7
refs/heads/master 25be42d38 -> 533677df8
CB-7512 Speed up gradle builds by building debug or release (not both)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/533677df
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/533677df
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/533677df
Branch: refs/heads/4.0.x
Commit: 533677df8b5d07903c8e70e1351d922d41ba18a8
Parents: 25be42d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 14:13:49 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 14:13:49 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/533677df/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 585b7af..e63e342 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -176,6 +176,11 @@ var builders = {
'copyDebugLint'
];
}
+ if (cmd == 'debug') {
+ cmd = 'assembleDebug';
+ } else if (cmd == 'release') {
+ cmd = 'assembleRelease';
+ }
var args = [cmd, '-b', path.join(ROOT, 'build.gradle')];
// 10 seconds -> 6 seconds
args.push('-Dorg.gradle.daemon=true');
@@ -216,7 +221,7 @@ var builders = {
build: function(build_type) {
var builder = this;
var wrapper = path.join(ROOT, 'gradlew');
- var args = builder.getArgs('build');
+ var args = this.getArgs(build_type == 'debug' ? 'debug' : 'release');
return Q().then(function() {
return spawn(wrapper, args);
}).then(function() {
[2/3] android commit: CB-7512 Speed up gradle builds by building
debug or release (not both)
Posted by ag...@apache.org.
CB-7512 Speed up gradle builds by building debug or release (not both)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/533677df
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/533677df
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/533677df
Branch: refs/heads/master
Commit: 533677df8b5d07903c8e70e1351d922d41ba18a8
Parents: 25be42d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 14:13:49 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 14:13:49 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/533677df/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 585b7af..e63e342 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -176,6 +176,11 @@ var builders = {
'copyDebugLint'
];
}
+ if (cmd == 'debug') {
+ cmd = 'assembleDebug';
+ } else if (cmd == 'release') {
+ cmd = 'assembleRelease';
+ }
var args = [cmd, '-b', path.join(ROOT, 'build.gradle')];
// 10 seconds -> 6 seconds
args.push('-Dorg.gradle.daemon=true');
@@ -216,7 +221,7 @@ var builders = {
build: function(build_type) {
var builder = this;
var wrapper = path.join(ROOT, 'gradlew');
- var args = builder.getArgs('build');
+ var args = this.getArgs(build_type == 'debug' ? 'debug' : 'release');
return Q().then(function() {
return spawn(wrapper, args);
}).then(function() {
[3/3] android commit: Merge branch 'master' into 4.0.x (gradle debug
v release)
Posted by ag...@apache.org.
Merge branch 'master' into 4.0.x (gradle debug v release)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6eb4409a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6eb4409a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6eb4409a
Branch: refs/heads/4.0.x
Commit: 6eb4409a726756ec01f4d4c0eeab86d292fa57a0
Parents: 8f27b2a 533677d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 14:14:46 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 14:14:46 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------