diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-09-29 20:18:21 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-09-29 20:18:21 (GMT) |
| commit | f067b35d278ddafcc4e48668f0eade10c71a69c0 (patch) | |
| tree | d857d41b26f9d377578854515a0a90c15f4485be /QMTest | |
| parent | 6ea319bd567743546bb77c6440ddb80d9a63b3cb (diff) | |
| download | SCons-f067b35d278ddafcc4e48668f0eade10c71a69c0.zip SCons-f067b35d278ddafcc4e48668f0eade10c71a69c0.tar.gz SCons-f067b35d278ddafcc4e48668f0eade10c71a69c0.tar.bz2 | |
add another possible path for JAVA_HOME on OSX
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 06fa575..75bf395 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -714,6 +714,9 @@ class TestSCons(TestCommon): home = '/System/Library/Frameworks/JavaVM.framework/Home' else: home = '/System/Library/Frameworks/JavaVM.framework/Versions/%s/Home' % version + if not os.path.exists(home): + # This works on OSX 10.10 + home = '/System/Library/Frameworks/JavaVM.framework/Versions/Current/' else: jar = self.java_where_jar(version) home = os.path.normpath('%s/..'%jar) |