mirror of https://github.com/kivy/pyjnius.git
Use the java from java_home on OSX.
This commit is contained in:
parent
734e54789b
commit
8c910485de
15
setup.py
15
setup.py
|
@ -44,14 +44,21 @@ if platform == 'android':
|
||||||
libraries = ['sdl', 'log']
|
libraries = ['sdl', 'log']
|
||||||
library_dirs = ['libs/' + environ['ARCH']]
|
library_dirs = ['libs/' + environ['ARCH']]
|
||||||
elif platform == 'darwin':
|
elif platform == 'darwin':
|
||||||
# TODO: this is the old Java 1.6 mechanism. Will need help for 1.7.
|
|
||||||
import subprocess
|
import subprocess
|
||||||
framework = subprocess.Popen('xcrun --sdk macosx --show-sdk-path',
|
framework = subprocess.Popen('/usr/libexec/java_home',
|
||||||
shell=True, stdout=subprocess.PIPE).communicate()[0].strip()
|
shell=True, stdout=subprocess.PIPE).communicate()[0].strip()
|
||||||
|
print('java_home: {0}\n'.format(framework));
|
||||||
if not framework:
|
if not framework:
|
||||||
raise Exception('You must install Java on your Mac OS X distro')
|
raise Exception('You must install Java on your Mac OS X distro')
|
||||||
extra_link_args = ['-framework', 'JavaVM']
|
if '1.6' in framework:
|
||||||
include_dirs = [join(framework, 'System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers')]
|
extra_link_args = ['-framework', 'JavaVM']
|
||||||
|
include_dirs = [join(framework, 'System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers')]
|
||||||
|
else:
|
||||||
|
# TODO: This won't make a dylib that moves from one machine to another.
|
||||||
|
# TODO: it needs a switch to dlopen and a configuration of the path.
|
||||||
|
java_runtime_lib = '{0}/jre/lib/server'.format(framework)
|
||||||
|
extra_link_args = ['-L', java_runtime_lib, '-ljvm', '-rpath', java_runtime_lib]
|
||||||
|
include_dirs = ['{0}/include'.format(framework), '{0}/include/darwin'.format(framework)]
|
||||||
else:
|
else:
|
||||||
import subprocess
|
import subprocess
|
||||||
# otherwise, we need to search the JDK_HOME
|
# otherwise, we need to search the JDK_HOME
|
||||||
|
|
Loading…
Reference in New Issue