From c5983e8f77515981b3d09cf1ff478a6cb9f1897b Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Wed, 10 Aug 2016 15:49:03 -0700 Subject: [PATCH] 8136930: Simplify use of module-system options by custom launchers Reviewed-by: alanb, ksrini, henryjen, sundar --- common/autoconf/boot-jdk.m4 | 2 +- common/autoconf/generated-configure.sh | 10 +- common/autoconf/spec.gmk.in | 2 +- common/conf/jib-profiles.js | 2 +- make/CompileJavaModules.gmk | 4 +- make/CreateJmods.gmk | 4 +- make/Images.gmk | 12 +-- make/InterimImage.gmk | 4 +- make/Javadoc.gmk | 132 ++++++++++++------------- make/common/MakeBase.gmk | 2 +- make/common/SetupJavaCompilers.gmk | 2 +- 11 files changed, 88 insertions(+), 88 deletions(-) diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 index d3fd298d704..83ec28e39bb 100644 --- a/common/autoconf/boot-jdk.m4 +++ b/common/autoconf/boot-jdk.m4 @@ -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]) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 02375c62e7f..92e055d9a12 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -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 diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index 510764002a2..e4d41e81b43 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -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 diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js index 2fa29a7c634..e57bbf7e4bd 100644 --- a/common/conf/jib-profiles.js +++ b/common/conf/jib-profiles.js @@ -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" diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index f377d6687c5..65e43933dec 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -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, \ )) diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk index 42ef85536da..c452f1b9cf1 100644 --- a/make/CreateJmods.gmk +++ b/make/CreateJmods.gmk @@ -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 $@) $@ diff --git a/make/Images.gmk b/make/Images.gmk index a1b0a70b243..c7df894ceaf 100644 --- a/make/Images.gmk +++ b/make/Images.gmk @@ -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) $@ diff --git a/make/InterimImage.gmk b/make/InterimImage.gmk index 6f05abe0b83..ba9f5622275 100644 --- a/make/InterimImage.gmk +++ b/make/InterimImage.gmk @@ -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) diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk index 866e3d711e3..8afd5514064 100644 --- a/make/Javadoc.gmk +++ b/make/Javadoc.gmk @@ -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)) ; \ diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk index 15c6bc6254d..8a715b410fb 100644 --- a/make/common/MakeBase.gmk +++ b/make/common/MakeBase.gmk @@ -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 diff --git a/make/common/SetupJavaCompilers.gmk b/make/common/SetupJavaCompilers.gmk index 8100cdbeccb..52b2cc337fe 100644 --- a/make/common/SetupJavaCompilers.gmk +++ b/make/common/SetupJavaCompilers.gmk @@ -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)))