stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 20:45:16 +02:00
commit b1f413d285
4 changed files with 27 additions and 6 deletions

1
.hgtags-top-repo

@ -319,3 +319,4 @@ c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71
57f3134853ecdd4a3ee2d4d26f22ba981d653d79 jdk9-b74
8fd6eeb878606e39c908f12535f34ebbfd225a4a jdk9-b75
d82072b699b880a1f647a5e2d7c0f86cec958941 jdk9-b76
7972dc8f2a47f0c4cd8f02fa5662af41f028aa14 jdk9-b77

7
make/CompileJavaModules.gmk

@ -491,6 +491,7 @@ SHARE_SRC_DIRS += \
$(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 @@ JAVA_MODULES := $(ALL_JAVA_MODULES)
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 @@ define SetupModuleCompilation
$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), \

6
make/Images.gmk

@ -46,9 +46,9 @@ PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk
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

19
modules.xml

@ -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>