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.

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

Supports JDK16 and later versions #70

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pyjab/common/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from pyjab.config import A11Y_PROPS_PATH
from pyjab.config import JAB_BRIDGE_DLL
from pyjab.config import JDK_BRIDGE_DLL
from pyjab.config import JDKBEF16_BRIDGE_DLL
from pyjab.config import JRE_BRIDGE_DLL


Expand Down Expand Up @@ -51,6 +52,7 @@ def load_library(self, bridge_dll: str = "") -> CDLL:
for dll in [
str(bridge_dll),
JDK_BRIDGE_DLL.format(dll_bit),
JDKBEF16_BRIDGE_DLL.format(dll_bit),
JRE_BRIDGE_DLL.format(dll_bit),
JAB_BRIDGE_DLL.format(dll_bit),
]:
Expand Down
3 changes: 2 additions & 1 deletion pyjab/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

# set JAB dll
WAB_DLL = "WindowsAccessBridge-{}.dll"
JDK_BRIDGE_DLL = os.environ.get("JAVA_HOME", ".") + f"\\jre\\bin\\{WAB_DLL}"
JDK_BRIDGE_DLL = os.environ.get("JAVA_HOME", ".") + f"\\bin\\{WAB_DLL}"
JDKBEF16_BRIDGE_DLL = os.environ.get("JAVA_HOME", ".") + f"\\jre\\bin\\{WAB_DLL}"
JRE_BRIDGE_DLL = os.environ.get("JRE_HOME", ".") + f"\\bin\\{WAB_DLL}"
JAB_BRIDGE_DLL = os.environ.get("JAB_HOME", ".") + f"\\{WAB_DLL}"

Expand Down