Mercurial > hg > jdk9-shenandoah
changeset 1607:59d19d081bbc
8133347: Add makefiles support and basic session, persistence history navigation with jline
Reviewed-by: erikj, jlahoda, jlaskey
author | sundar |
---|---|
date | Thu, 13 Aug 2015 19:09:59 +0530 |
parents | 4c85a31c02e8 |
children | 8c40d4143ee1 |
files | make/CompileJavaModules.gmk make/Images.gmk modules.xml |
diffstat | 3 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk Mon Aug 10 09:47:35 2015 +0200 +++ b/make/CompileJavaModules.gmk Thu Aug 13 19:09:59 2015 +0530 @@ -491,6 +491,7 @@ $(CORBA_TOPDIR)/src/$1/share/classes \ $(JAXP_TOPDIR)/src/$1/share/classes \ $(JAXWS_TOPDIR)/src/$1/share/classes \ + $(NASHORN_TOPDIR)/src/$1/share/classes \ # ALL_SRC_DIRS = \
--- a/make/Images.gmk Mon Aug 10 09:47:35 2015 +0200 +++ b/make/Images.gmk Thu Aug 13 19:09:59 2015 +0530 @@ -46,9 +46,9 @@ jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs # tools -TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.javadoc jdk.jcmd jdk.jconsole \ - jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdeps jdk.jdi jdk.jdwp.agent \ - jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws +TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.scripting.nashorn.shell \ + jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.hprof.agent jdk.jartool \ + jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws ifeq ($(OPENJDK_TARGET_OS), windows) PROVIDER_MODULES += jdk.crypto.mscapi
--- a/modules.xml Mon Aug 10 09:47:35 2015 +0200 +++ b/modules.xml Thu Aug 13 19:09:59 2015 +0530 @@ -1799,6 +1799,25 @@ <depend>java.base</depend> <depend>java.logging</depend> <depend>java.scripting</depend> + <export> + <name>jdk.nashorn.internal.runtime</name> + <to>jdk.scripting.nashorn.shell</to> + </export> + <export> + <name>jdk.nashorn.internal.objects</name> + <to>jdk.scripting.nashorn.shell</to> + </export> + <export> + <name>jdk.nashorn.tools</name> + <to>jdk.scripting.nashorn.shell</to> + </export> + </module> + <module> + <name>jdk.scripting.nashorn.shell</name> + <depend>java.base</depend> + <depend>java.prefs</depend> + <depend>jdk.scripting.nashorn</depend> + <depend>jdk.internal.le</depend> </module> <module> <name>jdk.sctp</name>