Mercurial > hg > jdk9-shenandoah
changeset 1591:b82c27650a7e
Merge
author | jbachorik |
---|---|
date | Fri, 10 Jul 2015 16:37:18 +0200 |
parents | bb77b3156c6e (current diff) 19173ee3553e (diff) |
children | 39b1000561b9 |
files | |
diffstat | 4 files changed, 31 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jul 09 12:56:38 2015 +0200 +++ b/.hgtags Fri Jul 10 16:37:18 2015 +0200 @@ -313,3 +313,5 @@ 70e4272790b6199e9ca89df2758ff9cb58ec4125 jdk9-b68 1bcfd6b8726582cff5a42dbfc75903e36f9dd4fe jdk9-b69 eed77fcd77711fcdba05f18fc22f37d86efb243c jdk9-b70 +c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71 +8582c35016fb6211b373810b6b172feccf9c483b jdk9-b72
--- a/make/CompileJavaModules.gmk Thu Jul 09 12:56:38 2015 +0200 +++ b/make/CompileJavaModules.gmk Fri Jul 10 16:37:18 2015 +0200 @@ -368,6 +368,10 @@ ################################################################################ +jdk.internal.le_COPY := .properties + +################################################################################ + jdk.jcmd_COPY := _options ################################################################################
--- a/make/Images.gmk Thu Jul 09 12:56:38 2015 +0200 +++ b/make/Images.gmk Fri Jul 10 16:37:18 2015 +0200 @@ -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 12:56:38 2015 +0200 +++ b/modules.xml Fri Jul 10 16:37:18 2015 +0200 @@ -250,6 +250,10 @@ <to>jdk.scripting.nashorn</to> </export> <export> + <name>jdk.internal</name> + <to>jdk.jfr</to> + </export> + <export> <name>sun.misc</name> <to>java.corba</to> <to>java.desktop</to> @@ -1629,6 +1633,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>