# HG changeset patch
# User lana
# Date 1439500482 25200
# Node ID 8c40d4143ee13bdf8170c68cc384c36ab1e9fadb
# Parent 675991eb9dd2364401fb887245d82a90b98bb47c# Parent 59d19d081bbcbd0288e9566cdf9332c470a42eb8
Merge
diff -r 675991eb9dd2 -r 8c40d4143ee1 make/CompileJavaModules.gmk
--- 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), \
diff -r 675991eb9dd2 -r 8c40d4143ee1 make/Images.gmk
--- 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
diff -r 675991eb9dd2 -r 8c40d4143ee1 modules.xml
--- 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 @@
java.base
java.logging
java.scripting
+
+ jdk.nashorn.internal.runtime
+ jdk.scripting.nashorn.shell
+
+
+ jdk.nashorn.internal.objects
+ jdk.scripting.nashorn.shell
+
+
+ jdk.nashorn.tools
+ jdk.scripting.nashorn.shell
+
+
+
+ jdk.scripting.nashorn.shell
+ java.base
+ java.prefs
+ jdk.scripting.nashorn
+ jdk.internal.le
jdk.sctp