Repository: cordova-android Updated Branches: refs/heads/master 9d3ee3d56 -> 89d982a8e
CB-10406 Fixes an exception, thrown when building using Ant. This closes #250 Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/89d982a8 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/89d982a8 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/89d982a8 Branch: refs/heads/master Commit: 89d982a8e463ef0b698d13dab91e45f2f1a8f4a9 Parents: 9d3ee3d Author: Vladimir Kotikov <[email protected]> Authored: Thu Jan 21 11:56:54 2016 +0300 Committer: Vladimir Kotikov <[email protected]> Committed: Fri Jan 22 13:29:50 2016 +0300 ---------------------------------------------------------------------- bin/templates/cordova/lib/builders/AntBuilder.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/89d982a8/bin/templates/cordova/lib/builders/AntBuilder.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/builders/AntBuilder.js b/bin/templates/cordova/lib/builders/AntBuilder.js index d214f48..7094fe5 100644 --- a/bin/templates/cordova/lib/builders/AntBuilder.js +++ b/bin/templates/cordova/lib/builders/AntBuilder.js @@ -45,7 +45,7 @@ util.inherits(AntBuilder, GenericBuilder); AntBuilder.prototype.getArgs = function(cmd, opts) { var args = [cmd, '-f', path.join(this.root, 'build.xml')]; // custom_rules.xml is required for incremental builds. - if (hasCustomRules()) { + if (hasCustomRules(this.root)) { args.push('-Dout.dir=ant-build', '-Dgen.absolute.dir=ant-gen'); } if(opts.packageInfo) { @@ -99,7 +99,7 @@ AntBuilder.prototype.prepEnv = function(opts) { AntBuilder.prototype.build = function(opts) { // Without our custom_rules.xml, we need to clean before building. var ret = Q(); - if (!hasCustomRules()) { + if (!hasCustomRules(this.root)) { // clean will call check_ant() for us. ret = this.clean(opts); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
