mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 22:23:22 +00:00
Code Activity

Java API: build system bugfixes.

Browse source 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
Christoph M. Wintersteiger 2013-02-21 16:46:18 +00:00
parent 876c6a361e
commit 2c6c09301f
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/mk_util.py
View file

@ -236,11 +236,11 @@ def find_java_home():
global JAVA_HOME global JAVA_HOME
if JAVA_HOME != None: if JAVA_HOME != None:
if IS_WINDOWS: if IS_WINDOWS:
ind = string.join(path, 'bin\java.exe') ind = '%s%s' % (JAVA_HOME, '\\bin\\java.exe')
else: else:
ind = string.join(path, 'bin/java') ind = '%s%s' % (JAVA_HOME, '/bin/java')
if not os.path.exists(ind): if not os.path.exists(ind):
raise MKException("Failed to detect java at '%s'.Possible solution: set JAVA_HOME with the path to JDK." % os.path.join(path)) raise MKException("Failed to detect java at '%s'.Possible solution: set JAVA_HOME with the path to JDK." % os.path.join(JAVA_HOME))
else: else:
return return
if is_verbose(): if is_verbose():
@ -261,7 +261,7 @@ def find_java_home():
tmp = m.group(1).split(os.sep) tmp = m.group(1).split(os.sep)
path = string.join(tmp[:len(tmp) - 3], os.sep) path = string.join(tmp[:len(tmp) - 3], os.sep)
if IS_WINDOWS: if IS_WINDOWS:
ind = '%s%s' % (path, '\bin\java.exe') ind = '%s%s' % (path, '\\bin\\java.exe')
else: else:
ind = '%s%s' % (path, '/bin/java') ind = '%s%s' % (path, '/bin/java')
if os.path.exists(ind): if os.path.exists(ind):