Mercurial > hg > jdk9-shenandoah
changeset 1608:8c40d4143ee1 jdk9-b78
Merge
author | lana |
---|---|
date | Thu, 13 Aug 2015 14:14:42 -0700 |
parents | 675991eb9dd2 (current diff) 59d19d081bbc (diff) |
children | 6cb424097242 d731e40878a7 db66a419590a |
files | |
diffstat | 3 files changed, 26 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk Thu Aug 13 12:20:03 2015 -0700 +++ b/make/CompileJavaModules.gmk Thu Aug 13 14:14:42 2015 -0700 @@ -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 = \ @@ -512,8 +513,8 @@ JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER))) # Create an empty directory to set the bootclasspath to. -EMPTY_BOOTCLASSPATH := $(SUPPORT_OUTPUTDIR)/empty-dir -$(call MakeDir, $(EMPTY_BOOTCLASSPATH)) +EMPTY_DIR := $(SUPPORT_OUTPUTDIR)/empty-dir +$(call MakeDir, $(EMPTY_DIR)) # This macro sets up compilation of a module and declares dependencies for it. # Param 1 - module name @@ -534,7 +535,7 @@ $1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent) endif $1_CLASSPATH := $$(subst $$(SPACE),$$(PATH_SEP),$$($1_CLASSPATH)) - $1_JAVAC_FLAGS := -bootclasspath $(EMPTY_BOOTCLASSPATH) -classpath "$$($1_CLASSPATH)" $$($1_ADD_JAVAC_FLAGS) + $1_JAVAC_FLAGS := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) -endorseddirs $(EMPTY_DIR) -classpath "$$($1_CLASSPATH)" $$($1_ADD_JAVAC_FLAGS) $$(eval $$(call SetupJavaCompilation,$1, \ SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
--- a/make/Images.gmk Thu Aug 13 12:20:03 2015 -0700 +++ b/make/Images.gmk Thu Aug 13 14:14:42 2015 -0700 @@ -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 Thu Aug 13 12:20:03 2015 -0700 +++ b/modules.xml Thu Aug 13 14:14:42 2015 -0700 @@ -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>