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 21:15:27 UTC
[1/3] android commit: CB-7512 Fix gradle not copying all archs to
out/ (broken by prev commit)
Repository: cordova-android
Updated Branches:
refs/heads/4.0.x 6fb164d20 -> 6bdc01290
refs/heads/master a5d300c6f -> ac34bf1e5
CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ac34bf1e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ac34bf1e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ac34bf1e
Branch: refs/heads/4.0.x
Commit: ac34bf1e54661bf5397846fc52800810fc1fb302
Parents: a5d300c
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 15:14:40 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 15:14:40 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ac34bf1e/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 3224758..2e6a624 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -155,7 +155,6 @@ var builders = {
process.exit(2);
}
var ret = candidates[0];
- console.log('Using apk: ' + ret);
return [ret];
}
},
@@ -256,9 +255,7 @@ var builders = {
}
return path.extname(candidate) == '.apk';
});
- var ret = candidates[0];
- console.log('Using apk: ' + ret);
- return [ret];
+ return candidates;
}
},
@@ -343,9 +340,14 @@ module.exports.run = function(options) {
// are used by get_apk().
var outputDir = path.join(ROOT, 'out');
shell.mkdir('-p', outputDir);
+ var builtApks = [];
for (var i=0; i < apkFiles.length; ++i) {
- shell.cp('-f', apkFiles[i], path.join(outputDir, path.basename(apkFiles[i])));
+ var dst = path.join(outputDir, path.basename(apkFiles[i]));
+ builtApks.push(dst);
+ shell.cp('-f', apkFiles[i], dst);
}
+ console.log('Built the following APKs:\n' + builtApks.join('\n'));
+ return builtApks;
});
};
[2/3] android commit: CB-7512 Fix gradle not copying all archs to
out/ (broken by prev commit)
Posted by ag...@apache.org.
CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ac34bf1e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ac34bf1e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ac34bf1e
Branch: refs/heads/master
Commit: ac34bf1e54661bf5397846fc52800810fc1fb302
Parents: a5d300c
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 15:14:40 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 15:14:40 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ac34bf1e/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 3224758..2e6a624 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -155,7 +155,6 @@ var builders = {
process.exit(2);
}
var ret = candidates[0];
- console.log('Using apk: ' + ret);
return [ret];
}
},
@@ -256,9 +255,7 @@ var builders = {
}
return path.extname(candidate) == '.apk';
});
- var ret = candidates[0];
- console.log('Using apk: ' + ret);
- return [ret];
+ return candidates;
}
},
@@ -343,9 +340,14 @@ module.exports.run = function(options) {
// are used by get_apk().
var outputDir = path.join(ROOT, 'out');
shell.mkdir('-p', outputDir);
+ var builtApks = [];
for (var i=0; i < apkFiles.length; ++i) {
- shell.cp('-f', apkFiles[i], path.join(outputDir, path.basename(apkFiles[i])));
+ var dst = path.join(outputDir, path.basename(apkFiles[i]));
+ builtApks.push(dst);
+ shell.cp('-f', apkFiles[i], dst);
}
+ console.log('Built the following APKs:\n' + builtApks.join('\n'));
+ return builtApks;
});
};
[3/3] android commit: Merge branch 'master' into 4.0.x (gradle fix)
Posted by ag...@apache.org.
Merge branch 'master' into 4.0.x (gradle fix)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6bdc0129
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6bdc0129
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6bdc0129
Branch: refs/heads/4.0.x
Commit: 6bdc01290ddb5cede4d937783f69fecb505b5078
Parents: 6fb164d ac34bf1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 15:15:11 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 15:15:11 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------