Mercurial > hg > openjdk > jigsaw > jdk
changeset 7368:f7bd3640d08a
add nashorn to the jdk.scripting module
author | mchung |
---|---|
date | Wed, 08 May 2013 10:34:20 -0700 |
parents | 053a0b46e437 |
children | 6d404402cfa3 |
files | make/modules/jdk.depconfig make/modules/modules.config make/modules/modules.group makefiles/ModulesCommon.gmk |
diffstat | 4 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/modules/jdk.depconfig Tue May 07 17:14:48 2013 -0700 +++ b/make/modules/jdk.depconfig Wed May 08 10:34:20 2013 -0700 @@ -609,3 +609,6 @@ @Provider(optional) sun.util.spi.XmlPropertiesProvider -> META-INF/services/sun.util.spi.XmlPropertiesProvider + +@Provider(optional) + javax.script.ScriptEngineFactory -> META-INF/services/javax.script.ScriptEngineFactory
--- a/make/modules/modules.config Tue May 07 17:14:48 2013 -0700 +++ b/make/modules/modules.config Wed May 08 10:34:20 2013 -0700 @@ -101,7 +101,7 @@ // lambda & ASM include java.util.function.**; - include jdk.**; + include jdk.Supported; include jdk.internal.org.objectweb.asm.**; include java.io.*; @@ -659,6 +659,14 @@ include com.sun.script.javascript.**, sun.org.mozilla.**; } +module nashorn { + include jdk.nashorn.**, + jdk.internal.dynalink.**, + netscape.**; + include jdk/nashorn/**; + include META-INF/services/javax.script.ScriptEngineFactory; +} + /**************************************************************************/ module httpserver {
--- a/make/modules/modules.group Tue May 07 17:14:48 2013 -0700 +++ b/make/modules/modules.group Wed May 08 10:34:20 2013 -0700 @@ -407,6 +407,7 @@ provides javax.script; include scripting; include scripting-rhino; + include nashorn; } // ## corba and jdbc depends on javax.transaction.
--- a/makefiles/ModulesCommon.gmk Tue May 07 17:14:48 2013 -0700 +++ b/makefiles/ModulesCommon.gmk Wed May 08 10:34:20 2013 -0700 @@ -110,5 +110,5 @@ # Classpath to use for Modularizer and compiling module-infos. Define it explicitly # to keep track of exactly what goes on it. -MODULARIZER_CLASSPATH := $(JDK_OUTPUTDIR)/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar$(PATH_SEP)$(JDK_OUTPUTDIR)/lib/sa-jdi.jar$(PATH_SEP)$(POSTMODULES_OUTPUTDIR)/lib/security/US_export_policy.jar$(PATH_SEP)$(POSTMODULES_OUTPUTDIR)/lib/security/local_policy.jar +MODULARIZER_CLASSPATH := $(JDK_OUTPUTDIR)/classes$(PATH_SEP)$(NASHORN_DIST)/nashorn.jar$(PATH_SEP)$(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar$(PATH_SEP)$(JDK_OUTPUTDIR)/lib/sa-jdi.jar$(PATH_SEP)$(POSTMODULES_OUTPUTDIR)/lib/security/US_export_policy.jar$(PATH_SEP)$(POSTMODULES_OUTPUTDIR)/lib/security/local_policy.jar