You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2015/09/29 08:46:38 UTC
android commit: CB-9608 cordova-android no longer builds on Node 0.10
or below
Repository: cordova-android
Updated Branches:
refs/heads/master afa61aeb0 -> 7d61a79a7
CB-9608 cordova-android no longer builds on Node 0.10 or below
Replaced path.isAbsolute usage with path.resolve. This closes #217
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/7d61a79a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7d61a79a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7d61a79a
Branch: refs/heads/master
Commit: 7d61a79a78c068a7a0554b0ea5699f1cf6681d56
Parents: afa61ae
Author: daserge <v-...@microsoft.com>
Authored: Wed Sep 23 15:57:03 2015 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Tue Sep 29 09:45:48 2015 +0300
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7d61a79a/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 268a7c5..1139719 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -503,11 +503,7 @@ function parseOpts(options, resolvedTarget) {
if (config.android && config.android[ret.buildType]) {
var androidInfo = config.android[ret.buildType];
if(androidInfo.keystore && !packageArgs.keystore) {
- if(path.isAbsolute(androidInfo.keystore)) {
- packageArgs.keystore = androidInfo.keystore;
- } else {
- packageArgs.keystore = path.relative(ROOT, path.join(path.dirname(buildConfig), androidInfo.keystore));
- }
+ packageArgs.keystore = path.resolve(path.dirname(buildConfig), androidInfo.keystore);
}
['alias', 'storePassword', 'password','keystoreType'].forEach(function (key){
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org