You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dr...@apache.org on 2014/01/22 15:29:46 UTC
git commit: handle new ant files
Updated Branches:
refs/heads/master 8ddeec4a7 -> 16dd43e08
handle new ant files
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/16dd43e0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/16dd43e0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/16dd43e0
Branch: refs/heads/master
Commit: 16dd43e0813f6c0484dece48368cce3ff725ed7f
Parents: 8ddeec4
Author: David Kemp <dr...@chromium.org>
Authored: Wed Jan 22 09:29:07 2014 -0500
Committer: David Kemp <dr...@chromium.org>
Committed: Wed Jan 22 09:29:07 2014 -0500
----------------------------------------------------------------------
src/build/makers/android.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/16dd43e0/src/build/makers/android.js
----------------------------------------------------------------------
diff --git a/src/build/makers/android.js b/src/build/makers/android.js
index 6051c90..7bef48f 100644
--- a/src/build/makers/android.js
+++ b/src/build/makers/android.js
@@ -34,7 +34,7 @@ module.exports = function(output, sha, devices, entry_point, couchdb_cfg, callba
var pkgname= 'mobilespec';
// compile
log('Compiling.');
- var ant = 'cd ' + output + ' && ant clean && ant debug';
+ var ant = 'cd ' + output + ' && '+path.join('.','cordova')+' build --debug';
shell.exec(ant, {silent:true,async:true},function(code, compile_output) {
log('Compile exit:'+code);
if (code > 0) {
@@ -42,6 +42,9 @@ module.exports = function(output, sha, devices, entry_point, couchdb_cfg, callba
callback(true);
} else {
var binary_path = path.join(output, 'bin', pkgname+'-debug.apk');
+ if( !fs.existsSync(binary_path)){
+ binary_path=path.join(output, 'ant-build', pkgname+'-debug.apk');
+ }
var package = 'org.apache.'+pkgname;
if (devices) {
// already have a specific set of devices to deploy to