summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/JavaCommon.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2018-10-02 21:20:00 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2018-10-02 21:20:00 (GMT)
commit7cae39dc41ee3ff6becb53dbc8c426eddff9b8ac (patch)
tree5a95b6c8a035aae298c901829fbc196fd6036d05 /src/engine/SCons/Tool/JavaCommon.py
parent98dfcef355d8d68360fde70afb52bc4250b1926b (diff)
downloadSCons-7cae39dc41ee3ff6becb53dbc8c426eddff9b8ac.zip
SCons-7cae39dc41ee3ff6becb53dbc8c426eddff9b8ac.tar.gz
SCons-7cae39dc41ee3ff6becb53dbc8c426eddff9b8ac.tar.bz2
Fixes for Java tests on win32
Diffstat (limited to 'src/engine/SCons/Tool/JavaCommon.py')
-rw-r--r--src/engine/SCons/Tool/JavaCommon.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py
index 83b0b05..2be31e3 100644
--- a/src/engine/SCons/Tool/JavaCommon.py
+++ b/src/engine/SCons/Tool/JavaCommon.py
@@ -402,7 +402,7 @@ def get_java_install_dirs(platform, version=None):
"""
Using patterns above find the java jdk install dir
:param platform:
- :param version:
+ :param version: If specified, only look for java sdk's of this version
:return: list of default paths for java.
"""
paths = []
@@ -415,6 +415,8 @@ def get_java_install_dirs(platform, version=None):
# do nothing for now
pass
+ paths=sorted(paths)
+
return paths