Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor of env.py #541

Closed
wants to merge 9 commits into from
Closed

Refactor of env.py #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6dfdc24
refactoring of Java location bootstrap, addressing #537
cmacdonald May 29, 2020
e588986
fix for mac, todo or android
cmacdonald May 29, 2020
ab7df83
added some default *nix search paths
cmacdonald Jun 4, 2020
4bda698
remove python 2.7 for this build
cmacdonald Jun 22, 2020
8afbdf1
make sure javac location is correct on Windows
cmacdonald Jun 22, 2020
9ad32cf
add library location for setup.py on Windows
cmacdonald Jun 22, 2020
640fa88
remove debug print
cmacdonald Jun 22, 2020
8023d44
Merge branch 'origin_master' into java_home
cmacdonald Oct 22, 2020
f98787d
Merge branch 'java_home' of github.com:cmacdonald/pyjnius into java_home
cmacdonald Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions jnius/__init__.py
View file
Open in desktop
Expand Up @@ -9,13 +9,14 @@

__version__ = '1.3.0'

from .env import get_jnius_lib_location, get_jdk_home
from .env import get_java_setup

import os
import sys
if sys.platform == 'win32' and sys.version_info >= (3, 8):
path = os.path.dirname(__file__)
jdk_home = get_jdk_home(sys.platform)
java = get_java_setup(sys.platform)
jdk_home = java.get_javahome()
with os.add_dll_directory(path):
for suffix in (
('bin', 'client'),
Expand Down