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

8136930: Simplify use of module-system options by custom launchers

Browse Source 
Reviewed-by: alanb, ksrini, henryjen, sundar
This commit is contained in:
Mandy Chung 2016-08-10 15:49:03 -07:00
parent bb1bd02549
commit c5983e8f77
11 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/autoconf/boot-jdk.m4
View File

@ -305,7 +305,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
BOOT_JDK_SOURCETARGET="-source 8 -target 8"
AC_SUBST(BOOT_JDK_SOURCETARGET)
ADD_JVM_ARG_IF_OK([-Xpatch:foo=bar], dummy, [$JAVA])
ADD_JVM_ARG_IF_OK([--patch-module foo=bar], dummy, [$JAVA])
AC_MSG_CHECKING([if Boot JDK supports modules])
if test "x$JVM_ARG_OK" = "xtrue"; then
AC_MSG_RESULT([yes])

10
common/autoconf/generated-configure.sh
View File

@ -5095,7 +5095,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1470415803
DATE_WHEN_GENERATED=1470863189
###############################################################################
#
@ -30596,13 +30596,13 @@ $as_echo "$tool_specified" >&6; }
$ECHO "Check if jvm arg is ok: -Xpatch:foo=bar" >&5
$ECHO "Command: $JAVA -Xpatch:foo=bar -version" >&5
OUTPUT=`$JAVA -Xpatch:foo=bar -version 2>&1`
$ECHO "Check if jvm arg is ok: --patch-module foo=bar" >&5
$ECHO "Command: $JAVA --patch-module foo=bar -version" >&5
OUTPUT=`$JAVA --patch-module foo=bar -version 2>&1`
FOUND_WARN=`$ECHO "$OUTPUT" | $GREP -i warn`
FOUND_VERSION=`$ECHO $OUTPUT | $GREP " version \""`
if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
dummy="$dummy -Xpatch:foo=bar"
dummy="$dummy --patch-module foo=bar"
JVM_ARG_OK=true
else
$ECHO "Arg failed:" >&5

2
common/autoconf/spec.gmk.in
View File

@ -585,7 +585,7 @@ INTERIM_OVERRIDE_MODULES := java.compiler jdk.compiler \
jdk.jdeps jdk.javadoc jdk.rmic
ifeq ($(BOOT_JDK_MODULAR), true)
INTERIM_OVERRIDE_MODULES_ARGS = $(foreach m, $(INTERIM_OVERRIDE_MODULES), \
-Xpatch:$m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
--patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
INTERIM_LANGTOOLS_ARGS = $(INTERIM_OVERRIDE_MODULES_ARGS)
JAVAC_MAIN_CLASS = -m jdk.compiler/com.sun.tools.javac.Main
JAVADOC_MAIN_CLASS = -m jdk.javadoc/jdk.javadoc.internal.tool.Main

2
common/conf/jib-profiles.js
View File

@ -417,7 +417,7 @@ var getJibProfilesDependencies = function (input, common) {
jtreg: {
server: "javare",
revision: "4.2",
build_number: "b02",
build_number: "b03",
checksum_file: "MD5_VALUES",
file: "jtreg_bin-4.2.zip",
environment_name: "JT_HOME"

4
make/CompileJavaModules.gmk
View File

@ -502,8 +502,8 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
ADD_JAVAC_FLAGS := \
$($(MODULE)_ADD_JAVAC_FLAGS) \
-modulesourcepath $(MODULESOURCEPATH) \
-modulepath $(MODULEPATH) \
--module-source-path $(MODULESOURCEPATH) \
--module-path $(MODULEPATH) \
-system none, \
))

4
make/CreateJmods.gmk
View File

@ -77,7 +77,7 @@ ifeq ($(MODULE), java.base)
EXCLUDE_PATTERN := $(strip $(subst $(SPACE),|,$(strip $(ALL_UPGRADEABLE_MODULES))))
JMOD_FLAGS += --modulepath $(JMODS_DIR) \
JMOD_FLAGS += --module-path $(JMODS_DIR) \
--hash-modules '^(?!$(EXCLUDE_PATTERN))'
endif
endif
@ -102,7 +102,7 @@ $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)
--os-name $(REQUIRED_OS_NAME) \
--os-arch $(OPENJDK_TARGET_CPU_LEGACY) \
--os-version $(REQUIRED_OS_VERSION) \
--modulepath $(JMODS_DIR) \
--module-path $(JMODS_DIR) \
--exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.pdb,*.map}' \
$(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@)
$(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@

12
make/Images.gmk
View File

@ -127,7 +127,7 @@ JLINK_ORDER_RESOURCES += \
/jdk.localedata/** \
#
JLINK_TOOL := $(JLINK) --modulepath $(IMAGES_OUTPUTDIR)/jmods \
JLINK_TOOL := $(JLINK) --module-path $(IMAGES_OUTPUTDIR)/jmods \
--endian $(OPENJDK_BUILD_CPU_ENDIAN) \
--release-info $(BASE_RELEASE_FILE) \
--order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
@ -142,7 +142,7 @@ $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
$(ECHO) Creating jdk jimage
$(RM) -r $(JDK_IMAGE_DIR)
$(JLINK_TOOL) --output $(JDK_IMAGE_DIR) \
--addmods $(JDK_MODULES_LIST) $(JLINK_EXTRA_OPTS)
--add-modules $(JDK_MODULES_LIST) $(JLINK_EXTRA_OPTS)
$(TOUCH) $@
$(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
@ -150,7 +150,7 @@ $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
$(ECHO) Creating jre jimage
$(RM) -r $(JRE_IMAGE_DIR)
$(JLINK_TOOL) --output $(JRE_IMAGE_DIR) \
--addmods $(JRE_MODULES_LIST)
--add-modules $(JRE_MODULES_LIST)
$(TOUCH) $@
JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1
@ -161,7 +161,7 @@ $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
$(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
$(ECHO) Creating jre compact1 jimage
$(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
$(JLINK_TOOL) --addmods $(JRE_COMPACT1_MODULES_LIST) \
$(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \
--output $(JRE_COMPACT1_IMAGE_DIR)
$(TOUCH) $@
@ -169,7 +169,7 @@ $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
$(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE)
$(ECHO) Creating jre compact2 jimage
$(RM) -r $(JRE_COMPACT2_IMAGE_DIR)
$(JLINK_TOOL) --addmods $(JRE_COMPACT2_MODULES_LIST) \
$(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \
--output $(JRE_COMPACT2_IMAGE_DIR)
$(TOUCH) $@
@ -177,7 +177,7 @@ $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
$(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
$(ECHO) Creating jre compact3 jimage
$(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
$(JLINK_TOOL) --addmods $(JRE_COMPACT3_MODULES_LIST) \
$(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \
--output $(JRE_COMPACT3_IMAGE_DIR)
$(TOUCH) $@

4
make/InterimImage.gmk
View File

@ -39,7 +39,7 @@ INTERIM_MODULES_LIST := $(call CommaList, $(INTERIM_IMAGE_MODULES))
JMODS := $(patsubst %, $(IMAGES_OUTPUTDIR)/jmods/%.jmod, $(INTERIM_IMAGE_MODULES))
JLINK_TOOL := $(JLINK) \
--modulepath $(IMAGES_OUTPUTDIR)/jmods \
--module-path $(IMAGES_OUTPUTDIR)/jmods \
--endian $(OPENJDK_BUILD_CPU_ENDIAN)
$(INTERIM_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
@ -48,7 +48,7 @@ $(INTERIM_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
$(RM) -r $(INTERIM_IMAGE_DIR)
$(JLINK_TOOL) \
--output $(INTERIM_IMAGE_DIR) \
--addmods $(INTERIM_MODULES_LIST)
--add-modules $(INTERIM_MODULES_LIST)
$(TOUCH) $@
TARGETS += $(INTERIM_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)

132
make/Javadoc.gmk
View File

@ -425,9 +425,9 @@ $(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:reference) ; \
$(call OptionOnly,-Xdoclint/package:-org.omg.*$(COMMA)jdk.internal.logging.*) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(COREAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(COREAPI_MODULES)) ; \
$(call OptionPair,-encoding,ISO-8859-1) ; \
$(call OptionOnly,-splitIndex) ; \
$(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
@ -488,9 +488,9 @@ $(DOCLETAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(DOCLETAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(DOCLETAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-breakiterator) ; \
$(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
@ -550,9 +550,9 @@ $(OLD_DOCLETAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(OLD_DOCLETAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(OLD_DOCLETAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-breakiterator) ; \
$(call OptionPair,-doctitle,$(OLD_DOCLETAPI_DOCTITLE)) ; \
@ -605,9 +605,9 @@ $(TAGLETAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(TAGLETAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(TAGLETAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-breakiterator) ; \
$(call OptionPair,-doctitle,$(TAGLETAPI_DOCTITLE)) ; \
@ -667,9 +667,9 @@ $(DOMAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(DOMAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(DOMAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-splitIndex) ; \
$(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
@ -736,9 +736,9 @@ $(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JDI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(JDI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
$(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
@ -829,9 +829,9 @@ $(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JAAS_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(JAAS_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
$(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
@ -888,9 +888,9 @@ $(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JGSS_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(JGSS_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
@ -947,9 +947,9 @@ $(SMARTCARDIO_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(SMARTCARDIO_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(SMARTCARDIO_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
@ -1004,9 +1004,9 @@ $(HTTPSERVER_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(HTTPSERVER_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(HTTPSERVER_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
@ -1061,9 +1061,9 @@ $(JSOBJECT_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JSOBJECT_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(JSOBJECT_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(JSOBJECT_DOCTITLE)) ; \
@ -1121,9 +1121,9 @@ $(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(MGMT_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(MGMT_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
@ -1179,9 +1179,9 @@ $(ATTACH_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(ATTACH_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(ATTACH_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
@ -1236,9 +1236,9 @@ $(JCONSOLE_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JCONSOLE_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(JCONSOLE_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
@ -1294,9 +1294,9 @@ $(JSHELLAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JSHELLAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(JSHELLAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionPair,-overview,$(JSHELLAPI_OVERVIEW)) ; \
$(call OptionPair,-doctitle,$(JSHELLAPI_DOCTITLE)) ; \
@ -1353,9 +1353,9 @@ $(TREEAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(TREEAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(TREEAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
$(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
@ -1412,9 +1412,9 @@ $(NASHORNAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(NASHORNAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(NASHORNAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionPair,-doctitle,$(NASHORNAPI_DOCTITLE)) ; \
$(call OptionPair,-windowtitle,$(NASHORNAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
@ -1471,9 +1471,9 @@ $(DYNALINKAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(DYNALINKAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(DYNALINKAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionPair,-doctitle,$(DYNALINKAPI_DOCTITLE)) ; \
$(call OptionPair,-windowtitle,$(DYNALINKAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
@ -1527,9 +1527,9 @@ $(SCTPAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(SCTPAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(SCTPAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
@ -1584,9 +1584,9 @@ $(JACCESSAPI_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JACCESSAPI_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(JACCESSAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(JACCESSAPI_DOCTITLE)) ; \
@ -1641,9 +1641,9 @@ $(JDKNET_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JDKNET_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(JDKNET_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(JDKNET_DOCTITLE)) ; \
@ -1702,9 +1702,9 @@ $(JLINK_PLUGIN_OPTIONS_FILE):
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JLINK_PLUGIN_MODULES)) ; \
$(call OptionPair,--system,none) ; \
$(call OptionPair,--module-source-path,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,--add-modules,$(JLINK_PLUGIN_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(JLINK_PLUGIN_DOCTITLE)) ; \

2
make/common/MakeBase.gmk
View File

@ -828,7 +828,7 @@ else
endif
################################################################################
# Return a string suitable for use after a -classpath or -modulepath option. It
# Return a string suitable for use after a -classpath or --module-path option. It
# will be correct and safe to use on all platforms. Arguments are given as space
# separate classpath entries. Safe for multiple nested calls.
# param 1 : A space separated list of classpath entries

2
make/common/SetupJavaCompilers.gmk
View File

@ -88,7 +88,7 @@ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
JVM := $(JAVA_SMALL), \
JAVAC := $(NEW_JAVAC), \
FLAGS := -upgrademodulepath $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \
FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))