make/project.properties

@@ -24,10 +24,13 @@
 application.title=nashorn
 
 # location of JDK embedded ASM sources
 jdk.asm.src.dir=../jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm
 
+# location of JDK embedded jline sources
+jdk.jline.src.dir=../jdk/src/jdk.internal.le/share/classes
+
 # source and target levels
 build.compiler=modern
 javac.source=1.8
 javac.target=1.8
 

@@ -110,11 +113,11 @@
 javac.test.classpath=\
     ${build.classes.dir}${path.separator}\
     ${build.test.classes.dir}${path.separator}\
     ${file.reference.testng.jar}
 
-meta.inf.dir=${src.dir}/META-INF
+meta.inf.dir=${nashorn.module.src.dir}/META-INF
 
 run.classpath=\
     ${build.classes.dir}
 
 # test scripts to run

@@ -264,11 +267,17 @@
 run.test.classpath=\
     ${file.reference.testng.jar}${path.separator}\
     ${nashorn.internal.tests.jar}${path.separator}\
     ${nashorn.api.tests.jar}
 
-src.dir=src/jdk.scripting.nashorn/share/classes
+nashorn.module.src.dir=src/jdk.scripting.nashorn/share/classes
+nashorn.shell.module.src.dir=src/jdk.scripting.nashorn.shell/share/classes
+
+src.dir=${nashorn.module.src.dir}${path.separator}\
+        ${nashorn.shell.module.src.dir}${path.separator}\
+        ${jdk.jline.src.dir}
+
 test.src.dir=test/src
 
 # -Xmx is used for all tests, -Xms only for octane benchmark
 run.test.xmx=2G
 run.test.xms=2G