breautek opened a new pull request #1228: URL: https://github.com/apache/cordova-android/pull/1228
<!-- Please make sure the checklist boxes are all checked before submitting the PR. The checklist is intended as a quick reference, for complete details please see our Contributor Guidelines: http://cordova.apache.org/contribute/contribute_guidelines.html Thanks! --> ### Platforms affected Android ### Motivation and Context <!-- Why is this change required? What problem does it solve? --> <!-- If it fixes an open issue, please link to the issue here. --> Fixes https://github.com/apache/cordova-android/issues/1221 Fixes https://github.com/apache/cordova-android/issues/1203 ### Description <!-- Describe your changes in detail --> This addresses two flaws in Java checking. 1. If some Java options are present, `javac -version` will print out additional lines of information. A regex is used to find the `java(c) x.x.x` line for proper version checking. 2. If `JAVA_HOME` is set, we would only set the path if `javac` wasn't findable, and when we do, we set the path at the end of the `PATH` chain. To be smarter, if `JAVA_HOME` is set, we **always** want to set the `JAVA_HOME` bin path to the front of the `PATH` chain so that we can guarantee the proper java executable to be used. ### Testing <!-- Please describe in detail how you tested your changes. --> Added new test for the `javac -version` issue. All existing tests passes. Manual testing for the `JAVA_HOME` issue. ### Checklist - [x] I've run the tests to see all new and existing tests pass - [x] I added automated test coverage as appropriate for this change - [x] Commit is prefixed with `(platform)` if this change only applies to one platform (e.g. `(android)`) - [x] If this Pull Request resolves an issue, I linked to the issue in the text above (and used the correct [keyword to close issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/)) - [x] I've updated the documentation if necessary -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
