Mercurial > hg > jdk9-shenandoah
changeset 1571:4c2cbaae528b jdk9-b73
Merge
author | lana |
---|---|
date | Thu, 09 Jul 2015 16:36:38 -0700 |
parents | 7ef2dff49c78 (current diff) dd33ad17d6fa (diff) |
children | 4d342b8cc40f bea3a9e40c23 19173ee3553e |
files | |
diffstat | 3 files changed, 25 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk Thu Jul 09 13:49:31 2015 -0700 +++ b/make/CompileJavaModules.gmk Thu Jul 09 16:36:38 2015 -0700 @@ -368,6 +368,10 @@ ################################################################################ +jdk.internal.le_COPY := .properties + +################################################################################ + jdk.jcmd_COPY := _options ################################################################################
--- a/make/Images.gmk Thu Jul 09 13:49:31 2015 -0700 +++ b/make/Images.gmk Thu Jul 09 16:36:38 2015 -0700 @@ -46,7 +46,7 @@ jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs # tools -TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.javadoc jdk.jcmd jdk.jconsole \ +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
--- a/modules.xml Thu Jul 09 13:49:31 2015 -0700 +++ b/modules.xml Thu Jul 09 16:36:38 2015 -0700 @@ -1625,6 +1625,26 @@ </export> </module> <module> + <name>jdk.internal.le</name> + <depend>java.base</depend> + <export> + <name>jdk.internal.jline</name> + <to>jdk.scripting.nashorn.shell</to> + </export> + <export> + <name>jdk.internal.jline.console</name> + <to>jdk.scripting.nashorn.shell</to> + </export> + <export> + <name>jdk.internal.jline.console.completer</name> + <to>jdk.scripting.nashorn.shell</to> + </export> + <export> + <name>jdk.internal.jline.console.history</name> + <to>jdk.scripting.nashorn.shell</to> + </export> + </module> + <module> <name>jdk.jartool</name> <depend>java.base</depend> <export>