Permalink
Browse files

Correctly use java 9 classlist.

  • Loading branch information...
bsteffensmeier committed Nov 20, 2017
1 parent 85929c1 commit b33a0fa55e7e38bac285f13ff499440d2201b766
Showing with 5 additions and 2 deletions.
  1. +2 −1 setup.py
  2. +3 −1 src/jep/ClassList.java
View
@@ -110,7 +110,8 @@ def read_file(name):
java_files=get_files('.java'),
extra_jar_files=['src/jep/classlist_6.txt',
'src/jep/classlist_7.txt',
'src/jep/classlist_8.txt'],
'src/jep/classlist_8.txt',
'src/jep/classlist_9.txt'],
javah_files=[ # tuple containing class and the header file to output
('jep.Jep', 'jep.h'),
('jep.python.PyObject', 'jep_object.h'),
View
@@ -175,7 +175,9 @@ private void loadClassList() throws JepException {
Thread.currentThread().getContextClassLoader(),
Jep.class.getClassLoader() };
String rsc = "jep/classlist_";
if (version.startsWith("1.8")) {
if (version.startsWith("9.")) {
rsc += "9";
}else if (version.startsWith("1.8")) {
rsc += "8";
} else if (version.startsWith("1.7")) {
rsc += "7";

0 comments on commit b33a0fa

Please sign in to comment.