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/29 16:17:08 UTC
[1/5] android commit: CB-7410 update the docs to match the actual
title
Repository: cordova-android
Updated Branches:
refs/heads/3.6.x 1c3f7e6f9 -> c2bba3f5e
refs/heads/4.0.x 6d5b88d7b -> e5efc91ef
refs/heads/master a658ea157 -> e31c911c3
CB-7410 update the docs to match the actual title
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a658ea15
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a658ea15
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a658ea15
Branch: refs/heads/4.0.x
Commit: a658ea15736b2f7f5dd4f508ac7728f7ca93cdce
Parents: a986e72
Author: Marcel Kinard <cm...@gmail.com>
Authored: Thu Sep 25 11:25:09 2014 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Thu Sep 25 11:25:09 2014 -0400
----------------------------------------------------------------------
test/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a658ea15/test/README.md
----------------------------------------------------------------------
diff --git a/test/README.md b/test/README.md
index 38d76a5..6f63674 100755
--- a/test/README.md
+++ b/test/README.md
@@ -34,7 +34,7 @@ found at https://code.google.com/p/robotium/ and the jar should be put in the
To run manually from command line:
0. Build by entering `ant debug install`
-0. Run tests by clicking on "CordovaTest" icon on device
+0. Run tests by clicking on "CordovaNativeTests" app icon on the device
To run from Eclipse:
[3/5] android commit: CB-7634 Detect JAVA_HOME properly on Ubuntu
Posted by ag...@apache.org.
CB-7634 Detect JAVA_HOME properly on Ubuntu
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e31c911c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e31c911c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e31c911c
Branch: refs/heads/master
Commit: e31c911c3056f06ed936a40c27f5723d97ed4692
Parents: a658ea1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 29 10:15:37 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 29 10:16:22 2014 -0400
----------------------------------------------------------------------
bin/lib/check_reqs.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e31c911c/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index a7410e9..e527571 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -101,7 +101,8 @@ module.exports.check_java = function() {
});
} else {
// See if we can derive it from javac's location.
- var maybeJavaHome = path.dirname(path.dirname(javacPath));
+ // fs.realpathSync is require on Ubuntu, which symplinks from /usr/bin -> JDK
+ var maybeJavaHome = path.dirname(path.dirname(fs.realpathSync(javacPath)));
if (fs.existsSync(path.join(maybeJavaHome, 'lib', 'tools.jar'))) {
process.env['JAVA_HOME'] = maybeJavaHome;
} else {
[4/5] android commit: Merge branch 'master' into 4.0.x (JAVA_HOME on
Ubuntu)
Posted by ag...@apache.org.
Merge branch 'master' into 4.0.x (JAVA_HOME on Ubuntu)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e5efc91e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e5efc91e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e5efc91e
Branch: refs/heads/4.0.x
Commit: e5efc91ef4821b32cf5af834fac36da734c01c3e
Parents: 6d5b88d e31c911
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 29 10:16:33 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 29 10:16:33 2014 -0400
----------------------------------------------------------------------
bin/lib/check_reqs.js | 3 ++-
test/README.md | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] android commit: CB-7634 Detect JAVA_HOME properly on Ubuntu
Posted by ag...@apache.org.
CB-7634 Detect JAVA_HOME properly on Ubuntu
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e31c911c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e31c911c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e31c911c
Branch: refs/heads/4.0.x
Commit: e31c911c3056f06ed936a40c27f5723d97ed4692
Parents: a658ea1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 29 10:15:37 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 29 10:16:22 2014 -0400
----------------------------------------------------------------------
bin/lib/check_reqs.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e31c911c/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index a7410e9..e527571 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -101,7 +101,8 @@ module.exports.check_java = function() {
});
} else {
// See if we can derive it from javac's location.
- var maybeJavaHome = path.dirname(path.dirname(javacPath));
+ // fs.realpathSync is require on Ubuntu, which symplinks from /usr/bin -> JDK
+ var maybeJavaHome = path.dirname(path.dirname(fs.realpathSync(javacPath)));
if (fs.existsSync(path.join(maybeJavaHome, 'lib', 'tools.jar'))) {
process.env['JAVA_HOME'] = maybeJavaHome;
} else {
[5/5] android commit: CB-7634 Detect JAVA_HOME properly on Ubuntu
Posted by ag...@apache.org.
CB-7634 Detect JAVA_HOME properly on Ubuntu
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/c2bba3f5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/c2bba3f5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/c2bba3f5
Branch: refs/heads/3.6.x
Commit: c2bba3f5e36c5b91bb6da4d943efe18df633fb6d
Parents: 1c3f7e6
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 29 10:15:37 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 29 10:16:52 2014 -0400
----------------------------------------------------------------------
bin/lib/check_reqs.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/c2bba3f5/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 40f3ade..af61938 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -100,7 +100,8 @@ module.exports.check_java = function() {
});
} else {
// See if we can derive it from javac's location.
- var maybeJavaHome = path.dirname(path.dirname(javacPath));
+ // fs.realpathSync is require on Ubuntu, which symplinks from /usr/bin -> JDK
+ var maybeJavaHome = path.dirname(path.dirname(fs.realpathSync(javacPath)));
if (fs.existsSync(path.join(maybeJavaHome, 'lib', 'tools.jar'))) {
process.env['JAVA_HOME'] = maybeJavaHome;
} else {