--- old/make/project.properties 2015-08-12 21:19:25.043625900 +0530 +++ new/make/project.properties 2015-08-12 21:19:24.674604800 +0530 @@ -26,6 +26,9 @@ # 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 @@ -112,7 +115,7 @@ ${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} @@ -266,7 +269,13 @@ ${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