Rooba
/
pyjnius
mirror of https://github.com/kivy/pyjnius.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

On OSX we should favor Java distribution that declare JAVA_HOME

This commit is contained in:
Hadrien Mary 2018-11-24 18:24:08 -05:00
parent 8aa91781f6
commit 5b95e578d6
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
setup.py
View File

@ -99,41 +99,51 @@ if PLATFORM == 'android':
# for android, we use SDL... # for android, we use SDL...
LIBRARIES = ['sdl', 'log'] LIBRARIES = ['sdl', 'log']
LIBRARY_DIRS = ['libs/' + getenv('ARCH')] LIBRARY_DIRS = ['libs/' + getenv('ARCH')]
elif PLATFORM == 'darwin': elif PLATFORM == 'darwin':
FRAMEWORK = subprocess.Popen(
JAVA_HOME = subprocess.Popen(
'/usr/libexec/java_home', '/usr/libexec/java_home',
stdout=subprocess.PIPE, shell=True).communicate()[0] stdout=subprocess.PIPE, shell=True).communicate()[0]
if PY3: if PY3:
FRAMEWORK = FRAMEWORK.decode() JAVA_HOME = JAVA_HOME.decode()
FRAMEWORK = FRAMEWORK.strip()
print('java_home: {0}\n'.format(FRAMEWORK)) JAVA_HOME = JAVA_HOME.strip()
if not FRAMEWORK:
if not JAVA_HOME:
raise Exception('You must install Java on your Mac OS X distro') raise Exception('You must install Java on your Mac OS X distro')
if '1.6' in FRAMEWORK:
if '1.6' in JAVA_HOME:
LIB_LOCATION = '../Libraries/libjvm.dylib' LIB_LOCATION = '../Libraries/libjvm.dylib'
INCLUDE_DIRS = [join( INCLUDE_DIRS = [join(
FRAMEWORK, ( JAVA_HOME, (
'System/Library/Frameworks/' 'System/Library/Frameworks/'
'JavaVM.framework/Versions/Current/Headers' 'JavaVM.framework/Versions/Current/Headers'
) )
)] )]
else: else:
LIB_LOCATION = 'jre/lib/server/libjvm.dylib' LIB_LOCATION = 'jre/lib/server/libjvm.dylib'
FULL_LIB_LOCATION = join(FRAMEWORK, LIB_LOCATION)
# We want to favor Java installation declaring JAVA_HOME
if getenv('JAVA_HOME'):
JAVA_HOME = getenv('JAVA_HOME')
FULL_LIB_LOCATION = join(JAVA_HOME, LIB_LOCATION)
if not exists(FULL_LIB_LOCATION): if not exists(FULL_LIB_LOCATION):
JAVA_HOME = getenv('JAVA_HOME') # In that case, the Java version is very likely >=9.
FULL_LIB_LOCATION = join(JAVA_HOME, LIB_LOCATION) # So we need to modify the `libjvm.so` path.
if not exists(FULL_LIB_LOCATION): LIB_LOCATION = 'lib/server/libjvm.dylib'
# In that case, the Java version is very likely >=9.
# So we need to modify the `libjvm.so` path.
LIB_LOCATION = 'lib/server/libjvm.dylib'
INCLUDE_DIRS = [ INCLUDE_DIRS = [
'{0}/include'.format(FRAMEWORK), '{0}/include'.format(JAVA_HOME),
'{0}/include/darwin'.format(FRAMEWORK) '{0}/include/darwin'.format(JAVA_HOME)
] ]
compile_native_invocation_handler(FRAMEWORK)
print('JAVA_HOME: {0}\n'.format(JAVA_HOME))
compile_native_invocation_handler(JAVA_HOME)
else: else:
# note: if on Windows, set ONLY JAVA_HOME # note: if on Windows, set ONLY JAVA_HOME
# not on android or osx, we need to search the JDK_HOME # not on android or osx, we need to search the JDK_HOME