public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Merge branch 'master' into 4.0.x (JAVA_HOME on Ubuntu)

Browse Source
This commit is contained in:
Andrew Grieve 2014-09-29 10:16:33 -04:00
commit e5efc91ef4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/lib/check_reqs.js
View File

@ -101,7 +101,8 @@ module.exports.check_java = function() {
}); });
} else { } else {
// See if we can derive it from javac's location. // 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'))) { if (fs.existsSync(path.join(maybeJavaHome, 'lib', 'tools.jar'))) {
process.env['JAVA_HOME'] = maybeJavaHome; process.env['JAVA_HOME'] = maybeJavaHome;
} else { } else {

2
test/README.md
View File

@ -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: To run manually from command line:
0. Build by entering `ant debug install` 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: To run from Eclipse: