From 1bd015fb0c29e1e4ea3ada86b6c83bf000956c02 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Mon, 11 Jan 2021 11:28:29 +0000 Subject: [PATCH] 8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk Reviewed-by: erikj --- make/CompileJavaModules.gmk | 615 ++---------------- make/modules/java.base/Java.gmk | 50 ++ make/modules/java.compiler/Java.gmk | 27 + make/modules/java.datatransfer/Java.gmk | 28 + make/modules/java.desktop/Java.gmk | 152 +++++ make/modules/java.instrument/Java.gmk | 27 + make/modules/java.logging/Java.gmk | 27 + make/modules/java.management.rmi/Java.gmk | 27 + make/modules/java.management/Java.gmk | 27 + make/modules/java.naming/Java.gmk | 28 + make/modules/java.prefs/Java.gmk | 27 + make/modules/java.rmi/Java.gmk | 32 + make/modules/java.scripting/Java.gmk | 29 + make/modules/java.security.jgss/Java.gmk | 27 + make/modules/java.smartcardio/Java.gmk | 27 + make/modules/java.sql.rowset/Java.gmk | 32 + make/modules/java.sql/Java.gmk | 27 + make/modules/java.transaction.xa/Java.gmk | 27 + make/modules/java.xml.crypto/Java.gmk | 29 + make/modules/java.xml/Java.gmk | 29 + make/modules/jdk.aot/Java.gmk | 54 ++ make/modules/jdk.charsets/Java.gmk | 26 + make/modules/jdk.compiler/Java.gmk | 31 + make/modules/jdk.dev/Java.gmk | 30 + make/modules/jdk.dynalink/Java.gmk | 26 + make/modules/jdk.editpad/Java.gmk | 26 + make/modules/jdk.hotspot.agent/Java.gmk | 28 + make/modules/jdk.httpserver/Java.gmk | 26 + make/modules/jdk.incubator.vector/Java.gmk | 26 + make/modules/jdk.internal.jvmstat/Java.gmk | 26 + make/modules/jdk.internal.le/Java.gmk | 26 + make/modules/jdk.internal.opt/Java.gmk | 26 + make/modules/jdk.internal.vm.ci/Java.gmk | 38 ++ .../modules/jdk.internal.vm.compiler/Java.gmk | 88 +++ make/modules/jdk.jartool/Java.gmk | 27 + make/modules/jdk.javadoc/Java.gmk | 26 + make/modules/jdk.jcmd/Java.gmk | 26 + make/modules/jdk.jconsole/Java.gmk | 29 + make/modules/jdk.jdeps/Java.gmk | 30 + make/modules/jdk.jdi/Java.gmk | 33 + make/modules/jdk.jfr/Java.gmk | 28 + make/modules/jdk.jpackage/Java.gmk | 30 + make/modules/jdk.jshell/Java.gmk | 26 + make/modules/jdk.localedata/Java.gmk | 30 + make/modules/jdk.sctp/Java.gmk | 46 ++ make/modules/jdk.unsupported.desktop/Java.gmk | 26 + make/modules/sun.charsets/Java.gmk | 26 + 47 files changed, 1581 insertions(+), 573 deletions(-) create mode 100644 make/modules/java.base/Java.gmk create mode 100644 make/modules/java.compiler/Java.gmk create mode 100644 make/modules/java.datatransfer/Java.gmk create mode 100644 make/modules/java.desktop/Java.gmk create mode 100644 make/modules/java.instrument/Java.gmk create mode 100644 make/modules/java.logging/Java.gmk create mode 100644 make/modules/java.management.rmi/Java.gmk create mode 100644 make/modules/java.management/Java.gmk create mode 100644 make/modules/java.naming/Java.gmk create mode 100644 make/modules/java.prefs/Java.gmk create mode 100644 make/modules/java.rmi/Java.gmk create mode 100644 make/modules/java.scripting/Java.gmk create mode 100644 make/modules/java.security.jgss/Java.gmk create mode 100644 make/modules/java.smartcardio/Java.gmk create mode 100644 make/modules/java.sql.rowset/Java.gmk create mode 100644 make/modules/java.sql/Java.gmk create mode 100644 make/modules/java.transaction.xa/Java.gmk create mode 100644 make/modules/java.xml.crypto/Java.gmk create mode 100644 make/modules/java.xml/Java.gmk create mode 100644 make/modules/jdk.aot/Java.gmk create mode 100644 make/modules/jdk.charsets/Java.gmk create mode 100644 make/modules/jdk.compiler/Java.gmk create mode 100644 make/modules/jdk.dev/Java.gmk create mode 100644 make/modules/jdk.dynalink/Java.gmk create mode 100644 make/modules/jdk.editpad/Java.gmk create mode 100644 make/modules/jdk.hotspot.agent/Java.gmk create mode 100644 make/modules/jdk.httpserver/Java.gmk create mode 100644 make/modules/jdk.incubator.vector/Java.gmk create mode 100644 make/modules/jdk.internal.jvmstat/Java.gmk create mode 100644 make/modules/jdk.internal.le/Java.gmk create mode 100644 make/modules/jdk.internal.opt/Java.gmk create mode 100644 make/modules/jdk.internal.vm.ci/Java.gmk create mode 100644 make/modules/jdk.internal.vm.compiler/Java.gmk create mode 100644 make/modules/jdk.jartool/Java.gmk create mode 100644 make/modules/jdk.javadoc/Java.gmk create mode 100644 make/modules/jdk.jcmd/Java.gmk create mode 100644 make/modules/jdk.jconsole/Java.gmk create mode 100644 make/modules/jdk.jdeps/Java.gmk create mode 100644 make/modules/jdk.jdi/Java.gmk create mode 100644 make/modules/jdk.jfr/Java.gmk create mode 100644 make/modules/jdk.jpackage/Java.gmk create mode 100644 make/modules/jdk.jshell/Java.gmk create mode 100644 make/modules/jdk.localedata/Java.gmk create mode 100644 make/modules/jdk.sctp/Java.gmk create mode 100644 make/modules/jdk.unsupported.desktop/Java.gmk create mode 100644 make/modules/sun.charsets/Java.gmk diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index a76a8f4a21a..c039ad30b00 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -31,516 +31,6 @@ include MakeBase.gmk include Modules.gmk include JavaCompilation.gmk -# Hook to include the corresponding custom file, if present. -$(eval $(call IncludeCustomExtension, CompileJavaModules.gmk)) - -################################################################################ -# Module specific build settings - -java.base_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \ - '-Xdoclint/package:java.*,javax.*' -java.base_JAVAC_FLAGS += -XDstringConcat=inline -java.base_COPY += .icu .dat .spp .nrm content-types.properties \ - hijrah-config-Hijrah-umalqura_islamic-umalqura.properties -java.base_CLEAN += intrinsic.properties - -java.base_EXCLUDE_FILES += \ - $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java - -java.base_EXCLUDES += java/lang/doc-files - -# Exclude BreakIterator classes that are just used in compile process to generate -# data files and shouldn't go in the product -java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java - -ifeq ($(call isTargetOs, macosx aix), false) - java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java -endif - -ifeq ($(call isTargetOs, windows), true) - java.base_EXCLUDE_FILES += \ - sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ - # -endif - -################################################################################ - -java.compiler_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:java.*,javax.*' - -################################################################################ - -java.datatransfer_DOCLINT += -Xdoclint:all/protected,-reference \ - '-Xdoclint/package:java.*,javax.*' -java.datatransfer_COPY += flavormap.properties - -################################################################################ - -java.desktop_DOCLINT += -Xdoclint:all/protected,-reference \ - '-Xdoclint/package:java.*,javax.*' -java.desktop_COPY += .gif .png .wav .txt .xml .css .pf -java.desktop_CLEAN += iio-plugin.properties cursors.properties - -java.desktop_EXCLUDES += \ - java/awt/doc-files \ - javax/swing/doc-files \ - javax/swing/text/doc-files \ - javax/swing/plaf/synth/doc-files \ - javax/swing/undo/doc-files \ - sun/awt/X11/doc-files \ - # - -java.desktop_EXCLUDE_FILES += \ - javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ - javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ - javax/swing/plaf/nimbus/ScrollBarPainter.java \ - javax/swing/plaf/nimbus/SliderPainter.java \ - javax/swing/plaf/nimbus/SpinnerPainter.java \ - javax/swing/plaf/nimbus/SplitPanePainter.java \ - javax/swing/plaf/nimbus/TabbedPanePainter.java \ - sun/awt/resources/security-icon-bw16.png \ - sun/awt/resources/security-icon-bw24.png \ - sun/awt/resources/security-icon-bw32.png \ - sun/awt/resources/security-icon-bw48.png \ - sun/awt/resources/security-icon-interim16.png \ - sun/awt/resources/security-icon-interim24.png \ - sun/awt/resources/security-icon-interim32.png \ - sun/awt/resources/security-icon-interim48.png \ - sun/awt/resources/security-icon-yellow16.png \ - sun/awt/resources/security-icon-yellow24.png \ - sun/awt/resources/security-icon-yellow32.png \ - sun/awt/resources/security-icon-yellow48.png \ - sun/awt/X11/java-icon16.png \ - sun/awt/X11/java-icon24.png \ - sun/awt/X11/java-icon32.png \ - sun/awt/X11/java-icon48.png \ - .template \ - # - -ifeq ($(call isTargetOs, macosx), true) - # exclude all X11 on Mac. - java.desktop_EXCLUDES += \ - sun/awt/X11 \ - sun/java2d/x11 \ - sun/java2d/jules \ - sun/java2d/xr \ - com/sun/java/swing/plaf/gtk \ - # - java.desktop_EXCLUDE_FILES += \ - $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \ - $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \ - $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \ - $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \ - # -else - # TBD: figure out how to eliminate this long list - java.desktop_EXCLUDE_FILES += \ - sun/awt/X11/ScreenFormat.java \ - sun/awt/X11/XArc.java \ - sun/awt/X11/XChar2b.java \ - sun/awt/X11/XCharStruct.java \ - sun/awt/X11/XClassHint.java \ - sun/awt/X11/XComposeStatus.java \ - sun/awt/X11/XExtCodes.java \ - sun/awt/X11/XFontProp.java \ - sun/awt/X11/XFontSetExtents.java \ - sun/awt/X11/XFontStruct.java \ - sun/awt/X11/XGCValues.java \ - sun/awt/X11/XHostAddress.java \ - sun/awt/X11/XIMCallback.java \ - sun/awt/X11/XIMHotKeyTrigger.java \ - sun/awt/X11/XIMHotKeyTriggers.java \ - sun/awt/X11/XIMPreeditCaretCallbackStruct.java \ - sun/awt/X11/XIMPreeditDrawCallbackStruct.java \ - sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \ - sun/awt/X11/XIMStatusDrawCallbackStruct.java \ - sun/awt/X11/XIMStringConversionCallbackStruct.java \ - sun/awt/X11/XIMStringConversionText.java \ - sun/awt/X11/XIMStyles.java \ - sun/awt/X11/XIMText.java \ - sun/awt/X11/XIMValuesList.java \ - sun/awt/X11/XImage.java \ - sun/awt/X11/XKeyboardControl.java \ - sun/awt/X11/XKeyboardState.java \ - sun/awt/X11/XOMCharSetList.java \ - sun/awt/X11/XOMFontInfo.java \ - sun/awt/X11/XOMOrientation.java \ - sun/awt/X11/XPoint.java \ - sun/awt/X11/XRectangle.java \ - sun/awt/X11/XSegment.java \ - sun/awt/X11/XStandardColormap.java \ - sun/awt/X11/XTextItem.java \ - sun/awt/X11/XTextItem16.java \ - sun/awt/X11/XTextProperty.java \ - sun/awt/X11/XTimeCoord.java \ - sun/awt/X11/XWindowChanges.java \ - sun/awt/X11/XdbeSwapInfo.java \ - sun/awt/X11/XmbTextItem.java \ - sun/awt/X11/XwcTextItem.java -endif - -ifeq ($(call isTargetOs, windows), true) - java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk -endif - -ifeq ($(call isTargetOs, windows macosx), false) - java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java -endif - -# These files do not appear in the build result of the old build. This -# is because they are generated sources, but the AUTO_JAVA_FILES won't -# pick them up since they aren't generated when the source dirs are -# searched and they aren't referenced by any other classes so they won't -# be picked up by implicit compilation. On a rebuild, they are picked up -# and compiled. Exclude them here to produce the same rt.jar as the old -# build does when building just once. -java.desktop_EXCLUDE_FILES += \ - javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ - javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ - javax/swing/plaf/nimbus/ScrollBarPainter.java \ - javax/swing/plaf/nimbus/SliderPainter.java \ - javax/swing/plaf/nimbus/SpinnerPainter.java \ - javax/swing/plaf/nimbus/SplitPanePainter.java \ - javax/swing/plaf/nimbus/TabbedPanePainter.java \ - # - -################################################################################ - -java.scripting_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:java.*,javax.*' -java.scripting_COPY += .js -java.scripting_CLEAN += .properties - -################################################################################ - -java.instrument_DOCLINT += -Xdoclint:all/protected,-accessibility \ - '-Xdoclint/package:java.*,javax.*' - -################################################################################ - -java.logging_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \ - '-Xdoclint/package:java.*,javax.*' - -################################################################################ - -java.management_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \ - '-Xdoclint/package:java.*,javax.*' - -################################################################################ - -java.management.rmi_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:javax.*' - -################################################################################ - -java.prefs_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:java.*,javax.*' - -################################################################################ - -java.transaction.xa_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:javax.*' - -################################################################################ - -java.sql_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:java.*,javax.*' - -################################################################################ - -java.sql.rowset_DOCLINT += -Xdoclint:all/protected,-accessibility \ - '-Xdoclint/package:java.*,javax.*' -java.sql.rowset_CLEAN_FILES += $(wildcard \ - $(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \ - $(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties) - -################################################################################ - -java.rmi_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:java.*,javax.*' -java.rmi_CLEAN_FILES += $(wildcard \ - $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \ - $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties) - -################################################################################ - -java.xml_DOCLINT += -Xdoclint:all/protected,-accessibility \ - '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \ - javax.xml.transform javax.xml.validation javax.xml.xpath)' -java.xml_CLEAN += .properties - -################################################################################ - -java.naming_DOCLINT += -Xdoclint:all/protected,-accessibility \ - '-Xdoclint/package:java.*,javax.*' -java.naming_CLEAN += jndiprovider.properties - -################################################################################ - -java.security.jgss_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:java.*,javax.*' - -################################################################################ - -java.smartcardio_DOCLINT += -Xdoclint:all/protected,-accessibility \ - '-Xdoclint/package:java.*,javax.*' - -################################################################################ - -java.xml.crypto_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:java.*,javax.*' -java.xml.crypto_COPY += .dtd .xml -java.xml.crypto_CLEAN += .properties - -################################################################################ - -jdk.charsets_COPY += .dat - -################################################################################ - -################################################################################ - -jdk.compiler_DOCLINT += -Xdoclint:all/protected \ - '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*' -jdk.compiler_JAVAC_FLAGS += -XDstringConcat=inline -jdk.compiler_CLEAN_FILES += $(wildcard \ - $(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \ - sun/tools/serialver/resources)) - -################################################################################ - -jdk.hotspot.agent_DISABLED_WARNINGS += rawtypes serial cast static overrides \ - fallthrough -jdk.hotspot.agent_COPY += .gif .png .properties - -################################################################################ - -jdk.editpad_COPY += .properties - -################################################################################ - -jdk.jshell_COPY += .jsh .properties - -################################################################################ - -jdk.internal.le_COPY += .properties .caps .txt - -################################################################################ - -jdk.internal.opt_COPY += .properties - -################################################################################ - -jdk.jcmd_COPY += _options - -################################################################################ - -jdk.dynalink_CLEAN += .properties - -################################################################################ - -jdk.javadoc_COPY += .xml .css .js .js.template .png .txt - -################################################################################ - -jdk.jartool_DISABLED_WARNINGS += missing-explicit-ctor -jdk.jartool_JAVAC_FLAGS += -XDstringConcat=inline - -################################################################################ - -jdk.httpserver_DISABLED_WARNINGS += missing-explicit-ctor - -################################################################################ - -jdk.unsupported.desktop_DISABLED_WARNINGS += missing-explicit-ctor - -################################################################################ - -# No SCTP implementation on Mac OS X or AIX. These classes should be excluded. -SCTP_IMPL_CLASSES = \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \ - $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java - -ifeq ($(call isTargetOs, macosx), true) - jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) -endif - -ifeq ($(call isTargetOs, aix), true) - jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) -endif - -################################################################################ - -jdk.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \ - .postrm .postinst .list .sh .desktop .copyright .control .plist .template \ - .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff - -jdk.jpackage_CLEAN += .properties - -################################################################################ - -jdk.jconsole_COPY += .gif .png - -jdk.jconsole_CLEAN_FILES += $(wildcard \ - $(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties) - -################################################################################ - -jdk.jdeps_COPY += .txt - -jdk.jdeps_CLEAN_FILES += $(wildcard \ - $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \ - $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties) - -################################################################################ - -jdk.jdi_EXCLUDES += \ - com/sun/tools/example/debug/bdi \ - com/sun/tools/example/debug/event \ - com/sun/tools/example/debug/gui \ - com/sun/jdi/doc-files \ - # - -jdk.jdi_EXCLUDE_FILES += jdi-overview.html - -################################################################################ - -jdk.dev_CLEAN_FILES += $(wildcard \ - $(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \ - com/sun/tools/script/shell)) - -jdk.dev_COPY += .js oqlhelp.html .txt - -################################################################################ - -jdk.internal.jvmstat_COPY += aliasmap - -################################################################################ - -# -parameters provides method's parameters information in class file, -# JVMCI compilers make use of that information for various sanity checks. -# Don't use Indy strings concatenation to have good JVMCI startup performance. -# The exports are needed since JVMCI is dynamically exported (see -# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo). - -jdk.internal.vm.ci_JAVAC_FLAGS += -parameters -XDstringConcat=inline - -################################################################################ - -jdk.internal.vm.compiler_JAVAC_FLAGS += -parameters -XDstringConcat=inline \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler \ - # - -jdk.internal.vm.compiler_EXCLUDES += \ - jdk.internal.vm.compiler.collections.test \ - jdk.tools.jaotc.test \ - org.graalvm.compiler.api.directives.test \ - org.graalvm.compiler.api.test \ - org.graalvm.compiler.asm.aarch64.test \ - org.graalvm.compiler.asm.amd64.test \ - org.graalvm.compiler.asm.test \ - org.graalvm.compiler.core.aarch64.test \ - org.graalvm.compiler.core.amd64.test \ - org.graalvm.compiler.core.jdk9.test \ - org.graalvm.compiler.core.match.processor \ - org.graalvm.compiler.core.test \ - org.graalvm.compiler.debug.test \ - org.graalvm.compiler.graph.test \ - org.graalvm.compiler.hotspot.aarch64.test \ - org.graalvm.compiler.hotspot.amd64.test \ - org.graalvm.compiler.hotspot.jdk15.test \ - org.graalvm.compiler.hotspot.jdk9.test \ - org.graalvm.compiler.hotspot.lir.test \ - org.graalvm.compiler.hotspot.test \ - org.graalvm.compiler.jtt \ - org.graalvm.compiler.lir.jtt \ - org.graalvm.compiler.lir.test \ - org.graalvm.compiler.loop.test \ - org.graalvm.compiler.microbenchmarks \ - org.graalvm.compiler.nodeinfo.processor \ - org.graalvm.compiler.nodes.test \ - org.graalvm.compiler.options.processor \ - org.graalvm.compiler.options.test \ - org.graalvm.compiler.phases.common.test \ - org.graalvm.compiler.processor \ - org.graalvm.compiler.replacements.jdk10.test \ - org.graalvm.compiler.replacements.jdk12.test \ - org.graalvm.compiler.replacements.jdk9.test \ - org.graalvm.compiler.replacements.processor \ - org.graalvm.compiler.replacements.test \ - org.graalvm.compiler.serviceprovider.processor \ - org.graalvm.compiler.test \ - org.graalvm.compiler.virtual.bench \ - org.graalvm.micro.benchmarks \ - org.graalvm.util.test \ - # - -################################################################################ - -# -parameters provides method's parameters information in class file, -# JVMCI compilers make use of that information for various sanity checks. -# Don't use Indy strings concatenation to have good JAOTC startup performance. -# The exports are needed since JVMCI is dynamically exported (see -# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo). - -jdk.aot_JAVAC_FLAGS += -parameters -XDstringConcat=inline \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \ - --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler,jdk.aot \ - # - -jdk.aot_EXCLUDES += \ - jdk.tools.jaotc.test - # - -################################################################################ - -sun.charsets_COPY += .dat - -################################################################################ - -jdk.localedata_COPY += _dict _th -# Exclude BreakIterator classes that are just used in compile process to generate -# data files and shouldn't go in the product -jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java -jdk.localedata_KEEP_ALL_TRANSLATIONS := true -################################################################################ - -jdk.jfr_DISABLED_WARNINGS += exports -jdk.jfr_COPY := .xsd .xml .dtd -jdk.jfr_JAVAC_FLAGS := -XDstringConcat=inline - -################################################################################ - -jdk.incubator.vector_DOCLINT += -Xdoclint:all/protected - ################################################################################ # If this is an imported module that has prebuilt classes, only compile # module-info.java. @@ -577,60 +67,8 @@ MODULESOURCEPATH := $(call GetModuleSrcPath) # Add imported modules to the modulepath MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES)) -ifeq ($(MODULE), jdk.internal.vm.ci) - ## WORKAROUND jdk.internal.vm.ci source structure issue - JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \ - $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ - $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src))) - MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH)) -endif - -ifeq ($(MODULE), jdk.internal.vm.compiler) - ## WORKAROUND jdk.internal.vm.compiler source structure issue - VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \ - $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \ - $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src))) - MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH)) -endif - -ifeq ($(MODULE), jdk.aot) - ## WORKAROUND jdk.aot source structure issue - AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \ - $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ - $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src))) - MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH)) -endif - -$(eval $(call SetupJavaCompilation, $(MODULE), \ - SMALL_JAVA := false, \ - MODULE := $(MODULE), \ - SRC := $(wildcard $(MODULE_SRC_DIRS)), \ - INCLUDES := $(JDK_USER_DEFINED_FILTER), \ - FAIL_NO_SRC := $(FAIL_NO_SRC), \ - BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \ - HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \ - CREATE_API_DIGEST := true, \ - JAVAC_FLAGS := \ - $($(MODULE)_DOCLINT) \ - $($(MODULE)_JAVAC_FLAGS) \ - --module-source-path $(MODULESOURCEPATH) \ - --module-path $(MODULEPATH) \ - --system none, \ -)) - -TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA) - -# Declare dependencies between java compilations of different modules. -# Since the other modules are declared in different invocations of this file, -# use the macro to find the correct target file to depend on. -# Only the javac compilation actually depends on other modules so limit -# dependency declaration to that by using the *_COMPILE_TARGET variable. -$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \ - $(call SetupJavaCompilationApiTarget, $d, \ - $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d))) - ################################################################################ -# Copy zh_HK properties files from zh_TW +# Copy zh_HK properties files from zh_TW (needed by some modules) $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties $(install-file) @@ -645,13 +83,48 @@ CreateHkTargets = \ .properties \ ) -ifeq ($(MODULE), java.sql.rowset) - TARGETS += $(call CreateHkTargets, $(java.sql.rowset_CLEAN_FILES)) -endif +################################################################################ +# Include module specific build settings -ifeq ($(MODULE), java.rmi) - TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES)) -endif +-include $(TOPDIR)/make/modules/$(MODULE)/Java.gmk + +################################################################################ +# Setup the main compilation + +$(eval $(call SetupJavaCompilation, $(MODULE), \ + SMALL_JAVA := false, \ + MODULE := $(MODULE), \ + SRC := $(wildcard $(MODULE_SRC_DIRS)), \ + INCLUDES := $(JDK_USER_DEFINED_FILTER), \ + FAIL_NO_SRC := $(FAIL_NO_SRC), \ + BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \ + HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \ + CREATE_API_DIGEST := true, \ + CLEAN := $(CLEAN), \ + CLEAN_FILES := $(CLEAN_FILES), \ + COPY := $(COPY), \ + DISABLED_WARNINGS := $(DISABLED_WARNINGS_java), \ + EXCLUDES := $(EXCLUDES), \ + EXCLUDE_FILES := $(EXCLUDE_FILES), \ + KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \ + JAVAC_FLAGS := \ + $(DOCLINT) \ + $(JAVAC_FLAGS) \ + --module-source-path $(MODULESOURCEPATH) \ + --module-path $(MODULEPATH) \ + --system none, \ +)) + +TARGETS += $($(MODULE)) + +# Declare dependencies between java compilations of different modules. +# Since the other modules are declared in different invocations of this file, +# use the macro to find the correct target file to depend on. +# Only the javac compilation actually depends on other modules so limit +# dependency declaration to that by using the *_COMPILE_TARGET variable. +$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \ + $(call SetupJavaCompilationApiTarget, $d, \ + $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d))) ################################################################################ # If this is an imported module, copy the pre built classes and resources into @@ -675,10 +148,6 @@ endif ################################################################################ -$(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk)) - -################################################################################ - all: $(TARGETS) .PHONY: all diff --git a/make/modules/java.base/Java.gmk b/make/modules/java.base/Java.gmk new file mode 100644 index 00000000000..58d707e6148 --- /dev/null +++ b/make/modules/java.base/Java.gmk @@ -0,0 +1,50 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \ + '-Xdoclint/package:java.*,javax.*' +JAVAC_FLAGS += -XDstringConcat=inline +COPY += .icu .dat .spp .nrm content-types.properties \ + hijrah-config-Hijrah-umalqura_islamic-umalqura.properties +CLEAN += intrinsic.properties + +EXCLUDE_FILES += \ + $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java + +EXCLUDES += java/lang/doc-files + +# Exclude BreakIterator classes that are just used in compile process to generate +# data files and shouldn't go in the product +EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java + +ifeq ($(call isTargetOs, macosx aix), false) + EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java +endif + +ifeq ($(call isTargetOs, windows), true) + EXCLUDE_FILES += \ + sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ + # +endif diff --git a/make/modules/java.compiler/Java.gmk b/make/modules/java.compiler/Java.gmk new file mode 100644 index 00000000000..e124e8844d3 --- /dev/null +++ b/make/modules/java.compiler/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/java.datatransfer/Java.gmk b/make/modules/java.datatransfer/Java.gmk new file mode 100644 index 00000000000..a9f7c8f4f0a --- /dev/null +++ b/make/modules/java.datatransfer/Java.gmk @@ -0,0 +1,28 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-reference \ + '-Xdoclint/package:java.*,javax.*' +COPY += flavormap.properties diff --git a/make/modules/java.desktop/Java.gmk b/make/modules/java.desktop/Java.gmk new file mode 100644 index 00000000000..4b1c14a1133 --- /dev/null +++ b/make/modules/java.desktop/Java.gmk @@ -0,0 +1,152 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-reference \ + '-Xdoclint/package:java.*,javax.*' +COPY += .gif .png .wav .txt .xml .css .pf +CLEAN += iio-plugin.properties cursors.properties + +EXCLUDES += \ + java/awt/doc-files \ + javax/swing/doc-files \ + javax/swing/text/doc-files \ + javax/swing/plaf/synth/doc-files \ + javax/swing/undo/doc-files \ + sun/awt/X11/doc-files \ + # + +EXCLUDE_FILES += \ + javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ + javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ + javax/swing/plaf/nimbus/ScrollBarPainter.java \ + javax/swing/plaf/nimbus/SliderPainter.java \ + javax/swing/plaf/nimbus/SpinnerPainter.java \ + javax/swing/plaf/nimbus/SplitPanePainter.java \ + javax/swing/plaf/nimbus/TabbedPanePainter.java \ + sun/awt/resources/security-icon-bw16.png \ + sun/awt/resources/security-icon-bw24.png \ + sun/awt/resources/security-icon-bw32.png \ + sun/awt/resources/security-icon-bw48.png \ + sun/awt/resources/security-icon-interim16.png \ + sun/awt/resources/security-icon-interim24.png \ + sun/awt/resources/security-icon-interim32.png \ + sun/awt/resources/security-icon-interim48.png \ + sun/awt/resources/security-icon-yellow16.png \ + sun/awt/resources/security-icon-yellow24.png \ + sun/awt/resources/security-icon-yellow32.png \ + sun/awt/resources/security-icon-yellow48.png \ + sun/awt/X11/java-icon16.png \ + sun/awt/X11/java-icon24.png \ + sun/awt/X11/java-icon32.png \ + sun/awt/X11/java-icon48.png \ + .template \ + # + +ifeq ($(call isTargetOs, macosx), true) + # exclude all X11 on Mac. + EXCLUDES += \ + sun/awt/X11 \ + sun/java2d/x11 \ + sun/java2d/jules \ + sun/java2d/xr \ + com/sun/java/swing/plaf/gtk \ + # + EXCLUDE_FILES += \ + $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \ + $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \ + $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \ + $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \ + # +else + # TBD: figure out how to eliminate this long list + EXCLUDE_FILES += \ + sun/awt/X11/ScreenFormat.java \ + sun/awt/X11/XArc.java \ + sun/awt/X11/XChar2b.java \ + sun/awt/X11/XCharStruct.java \ + sun/awt/X11/XClassHint.java \ + sun/awt/X11/XComposeStatus.java \ + sun/awt/X11/XExtCodes.java \ + sun/awt/X11/XFontProp.java \ + sun/awt/X11/XFontSetExtents.java \ + sun/awt/X11/XFontStruct.java \ + sun/awt/X11/XGCValues.java \ + sun/awt/X11/XHostAddress.java \ + sun/awt/X11/XIMCallback.java \ + sun/awt/X11/XIMHotKeyTrigger.java \ + sun/awt/X11/XIMHotKeyTriggers.java \ + sun/awt/X11/XIMPreeditCaretCallbackStruct.java \ + sun/awt/X11/XIMPreeditDrawCallbackStruct.java \ + sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \ + sun/awt/X11/XIMStatusDrawCallbackStruct.java \ + sun/awt/X11/XIMStringConversionCallbackStruct.java \ + sun/awt/X11/XIMStringConversionText.java \ + sun/awt/X11/XIMStyles.java \ + sun/awt/X11/XIMText.java \ + sun/awt/X11/XIMValuesList.java \ + sun/awt/X11/XImage.java \ + sun/awt/X11/XKeyboardControl.java \ + sun/awt/X11/XKeyboardState.java \ + sun/awt/X11/XOMCharSetList.java \ + sun/awt/X11/XOMFontInfo.java \ + sun/awt/X11/XOMOrientation.java \ + sun/awt/X11/XPoint.java \ + sun/awt/X11/XRectangle.java \ + sun/awt/X11/XSegment.java \ + sun/awt/X11/XStandardColormap.java \ + sun/awt/X11/XTextItem.java \ + sun/awt/X11/XTextItem16.java \ + sun/awt/X11/XTextProperty.java \ + sun/awt/X11/XTimeCoord.java \ + sun/awt/X11/XWindowChanges.java \ + sun/awt/X11/XdbeSwapInfo.java \ + sun/awt/X11/XmbTextItem.java \ + sun/awt/X11/XwcTextItem.java +endif + +ifeq ($(call isTargetOs, windows), true) + EXCLUDES += com/sun/java/swing/plaf/gtk +endif + +ifeq ($(call isTargetOs, windows macosx), false) + EXCLUDE_FILES += sun/awt/AWTCharset.java +endif + +# These files do not appear in the build result of the old build. This +# is because they are generated sources, but the AUTO_JAVA_FILES won't +# pick them up since they aren't generated when the source dirs are +# searched and they aren't referenced by any other classes so they won't +# be picked up by implicit compilation. On a rebuild, they are picked up +# and compiled. Exclude them here to produce the same rt.jar as the old +# build does when building just once. +EXCLUDE_FILES += \ + javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ + javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ + javax/swing/plaf/nimbus/ScrollBarPainter.java \ + javax/swing/plaf/nimbus/SliderPainter.java \ + javax/swing/plaf/nimbus/SpinnerPainter.java \ + javax/swing/plaf/nimbus/SplitPanePainter.java \ + javax/swing/plaf/nimbus/TabbedPanePainter.java \ + # diff --git a/make/modules/java.instrument/Java.gmk b/make/modules/java.instrument/Java.gmk new file mode 100644 index 00000000000..5f46b155e0c --- /dev/null +++ b/make/modules/java.instrument/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-accessibility \ + '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/java.logging/Java.gmk b/make/modules/java.logging/Java.gmk new file mode 100644 index 00000000000..40da53d432b --- /dev/null +++ b/make/modules/java.logging/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \ + '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/java.management.rmi/Java.gmk b/make/modules/java.management.rmi/Java.gmk new file mode 100644 index 00000000000..4579fea6843 --- /dev/null +++ b/make/modules/java.management.rmi/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:javax.*' diff --git a/make/modules/java.management/Java.gmk b/make/modules/java.management/Java.gmk new file mode 100644 index 00000000000..40da53d432b --- /dev/null +++ b/make/modules/java.management/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \ + '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/java.naming/Java.gmk b/make/modules/java.naming/Java.gmk new file mode 100644 index 00000000000..32bb474385f --- /dev/null +++ b/make/modules/java.naming/Java.gmk @@ -0,0 +1,28 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-accessibility \ + '-Xdoclint/package:java.*,javax.*' +CLEAN += jndiprovider.properties diff --git a/make/modules/java.prefs/Java.gmk b/make/modules/java.prefs/Java.gmk new file mode 100644 index 00000000000..e124e8844d3 --- /dev/null +++ b/make/modules/java.prefs/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/java.rmi/Java.gmk b/make/modules/java.rmi/Java.gmk new file mode 100644 index 00000000000..69448146fa4 --- /dev/null +++ b/make/modules/java.rmi/Java.gmk @@ -0,0 +1,32 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:java.*,javax.*' +CLEAN_FILES += $(wildcard \ + $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \ + $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties) + +TARGETS += $(call CreateHkTargets, $(CLEAN_FILES)) diff --git a/make/modules/java.scripting/Java.gmk b/make/modules/java.scripting/Java.gmk new file mode 100644 index 00000000000..c9060b5fa46 --- /dev/null +++ b/make/modules/java.scripting/Java.gmk @@ -0,0 +1,29 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:java.*,javax.*' +COPY += .js +CLEAN += .properties diff --git a/make/modules/java.security.jgss/Java.gmk b/make/modules/java.security.jgss/Java.gmk new file mode 100644 index 00000000000..e124e8844d3 --- /dev/null +++ b/make/modules/java.security.jgss/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/java.smartcardio/Java.gmk b/make/modules/java.smartcardio/Java.gmk new file mode 100644 index 00000000000..5f46b155e0c --- /dev/null +++ b/make/modules/java.smartcardio/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-accessibility \ + '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/java.sql.rowset/Java.gmk b/make/modules/java.sql.rowset/Java.gmk new file mode 100644 index 00000000000..2ea5be28ed1 --- /dev/null +++ b/make/modules/java.sql.rowset/Java.gmk @@ -0,0 +1,32 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-accessibility \ + '-Xdoclint/package:java.*,javax.*' +CLEAN_FILES += $(wildcard \ + $(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \ + $(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties) + +TARGETS += $(call CreateHkTargets, $(CLEAN_FILES)) diff --git a/make/modules/java.sql/Java.gmk b/make/modules/java.sql/Java.gmk new file mode 100644 index 00000000000..e124e8844d3 --- /dev/null +++ b/make/modules/java.sql/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/java.transaction.xa/Java.gmk b/make/modules/java.transaction.xa/Java.gmk new file mode 100644 index 00000000000..4579fea6843 --- /dev/null +++ b/make/modules/java.transaction.xa/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:javax.*' diff --git a/make/modules/java.xml.crypto/Java.gmk b/make/modules/java.xml.crypto/Java.gmk new file mode 100644 index 00000000000..2680829fb60 --- /dev/null +++ b/make/modules/java.xml.crypto/Java.gmk @@ -0,0 +1,29 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:java.*,javax.*' +COPY += .dtd .xml +CLEAN += .properties diff --git a/make/modules/java.xml/Java.gmk b/make/modules/java.xml/Java.gmk new file mode 100644 index 00000000000..b7bf8b70165 --- /dev/null +++ b/make/modules/java.xml/Java.gmk @@ -0,0 +1,29 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected,-accessibility \ + '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \ + javax.xml.transform javax.xml.validation javax.xml.xpath)' +CLEAN += .properties diff --git a/make/modules/jdk.aot/Java.gmk b/make/modules/jdk.aot/Java.gmk new file mode 100644 index 00000000000..af920f0411d --- /dev/null +++ b/make/modules/jdk.aot/Java.gmk @@ -0,0 +1,54 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# -parameters provides method's parameters information in class file, +# JVMCI compilers make use of that information for various sanity checks. +# Don't use Indy strings concatenation to have good JAOTC startup performance. +# The exports are needed since JVMCI is dynamically exported (see +# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo). + +JAVAC_FLAGS += -parameters -XDstringConcat=inline \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler,jdk.aot \ + # + +EXCLUDES += \ + jdk.tools.jaotc.test + # + +## WORKAROUND jdk.aot source structure issue +AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \ + $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ + $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src))) +MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH)) diff --git a/make/modules/jdk.charsets/Java.gmk b/make/modules/jdk.charsets/Java.gmk new file mode 100644 index 00000000000..2745327c8e4 --- /dev/null +++ b/make/modules/jdk.charsets/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .dat diff --git a/make/modules/jdk.compiler/Java.gmk b/make/modules/jdk.compiler/Java.gmk new file mode 100644 index 00000000000..49572b6efb9 --- /dev/null +++ b/make/modules/jdk.compiler/Java.gmk @@ -0,0 +1,31 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected \ + '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*' +JAVAC_FLAGS += -XDstringConcat=inline +CLEAN_FILES += $(wildcard \ + $(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \ + sun/tools/serialver/resources)) diff --git a/make/modules/jdk.dev/Java.gmk b/make/modules/jdk.dev/Java.gmk new file mode 100644 index 00000000000..c26b4f9c8f6 --- /dev/null +++ b/make/modules/jdk.dev/Java.gmk @@ -0,0 +1,30 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +CLEAN_FILES += $(wildcard \ + $(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \ + com/sun/tools/script/shell)) + +COPY += .js oqlhelp.html .txt diff --git a/make/modules/jdk.dynalink/Java.gmk b/make/modules/jdk.dynalink/Java.gmk new file mode 100644 index 00000000000..852e68c0d31 --- /dev/null +++ b/make/modules/jdk.dynalink/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +CLEAN += .properties diff --git a/make/modules/jdk.editpad/Java.gmk b/make/modules/jdk.editpad/Java.gmk new file mode 100644 index 00000000000..ef2d3bcfa7c --- /dev/null +++ b/make/modules/jdk.editpad/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .properties diff --git a/make/modules/jdk.hotspot.agent/Java.gmk b/make/modules/jdk.hotspot.agent/Java.gmk new file mode 100644 index 00000000000..6e2d47f75fc --- /dev/null +++ b/make/modules/jdk.hotspot.agent/Java.gmk @@ -0,0 +1,28 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DISABLED_WARNINGS_java += rawtypes serial cast static overrides \ + fallthrough +COPY += .gif .png .properties diff --git a/make/modules/jdk.httpserver/Java.gmk b/make/modules/jdk.httpserver/Java.gmk new file mode 100644 index 00000000000..f892ebeb84c --- /dev/null +++ b/make/modules/jdk.httpserver/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DISABLED_WARNINGS_java += missing-explicit-ctor diff --git a/make/modules/jdk.incubator.vector/Java.gmk b/make/modules/jdk.incubator.vector/Java.gmk new file mode 100644 index 00000000000..a2013179ace --- /dev/null +++ b/make/modules/jdk.incubator.vector/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DOCLINT += -Xdoclint:all/protected diff --git a/make/modules/jdk.internal.jvmstat/Java.gmk b/make/modules/jdk.internal.jvmstat/Java.gmk new file mode 100644 index 00000000000..c22ef922aa0 --- /dev/null +++ b/make/modules/jdk.internal.jvmstat/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += aliasmap diff --git a/make/modules/jdk.internal.le/Java.gmk b/make/modules/jdk.internal.le/Java.gmk new file mode 100644 index 00000000000..4aedb8491f8 --- /dev/null +++ b/make/modules/jdk.internal.le/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .properties .caps .txt diff --git a/make/modules/jdk.internal.opt/Java.gmk b/make/modules/jdk.internal.opt/Java.gmk new file mode 100644 index 00000000000..ef2d3bcfa7c --- /dev/null +++ b/make/modules/jdk.internal.opt/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .properties diff --git a/make/modules/jdk.internal.vm.ci/Java.gmk b/make/modules/jdk.internal.vm.ci/Java.gmk new file mode 100644 index 00000000000..ad4991e5414 --- /dev/null +++ b/make/modules/jdk.internal.vm.ci/Java.gmk @@ -0,0 +1,38 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# -parameters provides method's parameters information in class file, +# JVMCI compilers make use of that information for various sanity checks. +# Don't use Indy strings concatenation to have good JVMCI startup performance. +# The exports are needed since JVMCI is dynamically exported (see +# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo). + +JAVAC_FLAGS += -parameters -XDstringConcat=inline + +## WORKAROUND jdk.internal.vm.ci source structure issue +JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \ + $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ + $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src))) +MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH)) diff --git a/make/modules/jdk.internal.vm.compiler/Java.gmk b/make/modules/jdk.internal.vm.compiler/Java.gmk new file mode 100644 index 00000000000..fd45f8170ca --- /dev/null +++ b/make/modules/jdk.internal.vm.compiler/Java.gmk @@ -0,0 +1,88 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +JAVAC_FLAGS += -parameters -XDstringConcat=inline \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler \ + --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler \ + # + +EXCLUDES += \ + jdk.internal.vm.compiler.collections.test \ + jdk.tools.jaotc.test \ + org.graalvm.compiler.api.directives.test \ + org.graalvm.compiler.api.test \ + org.graalvm.compiler.asm.aarch64.test \ + org.graalvm.compiler.asm.amd64.test \ + org.graalvm.compiler.asm.test \ + org.graalvm.compiler.core.aarch64.test \ + org.graalvm.compiler.core.amd64.test \ + org.graalvm.compiler.core.jdk9.test \ + org.graalvm.compiler.core.match.processor \ + org.graalvm.compiler.core.test \ + org.graalvm.compiler.debug.test \ + org.graalvm.compiler.graph.test \ + org.graalvm.compiler.hotspot.aarch64.test \ + org.graalvm.compiler.hotspot.amd64.test \ + org.graalvm.compiler.hotspot.jdk15.test \ + org.graalvm.compiler.hotspot.jdk9.test \ + org.graalvm.compiler.hotspot.lir.test \ + org.graalvm.compiler.hotspot.test \ + org.graalvm.compiler.jtt \ + org.graalvm.compiler.lir.jtt \ + org.graalvm.compiler.lir.test \ + org.graalvm.compiler.loop.test \ + org.graalvm.compiler.microbenchmarks \ + org.graalvm.compiler.nodeinfo.processor \ + org.graalvm.compiler.nodes.test \ + org.graalvm.compiler.options.processor \ + org.graalvm.compiler.options.test \ + org.graalvm.compiler.phases.common.test \ + org.graalvm.compiler.processor \ + org.graalvm.compiler.replacements.jdk10.test \ + org.graalvm.compiler.replacements.jdk12.test \ + org.graalvm.compiler.replacements.jdk9.test \ + org.graalvm.compiler.replacements.processor \ + org.graalvm.compiler.replacements.test \ + org.graalvm.compiler.serviceprovider.processor \ + org.graalvm.compiler.test \ + org.graalvm.compiler.virtual.bench \ + org.graalvm.micro.benchmarks \ + org.graalvm.util.test \ + # + +## WORKAROUND jdk.internal.vm.compiler source structure issue +VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \ + $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \ + $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src))) +MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH)) diff --git a/make/modules/jdk.jartool/Java.gmk b/make/modules/jdk.jartool/Java.gmk new file mode 100644 index 00000000000..1cf56a317e7 --- /dev/null +++ b/make/modules/jdk.jartool/Java.gmk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DISABLED_WARNINGS_java += missing-explicit-ctor +JAVAC_FLAGS += -XDstringConcat=inline diff --git a/make/modules/jdk.javadoc/Java.gmk b/make/modules/jdk.javadoc/Java.gmk new file mode 100644 index 00000000000..0fe708e6eae --- /dev/null +++ b/make/modules/jdk.javadoc/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .xml .css .js .js.template .png .txt diff --git a/make/modules/jdk.jcmd/Java.gmk b/make/modules/jdk.jcmd/Java.gmk new file mode 100644 index 00000000000..bec844a96f0 --- /dev/null +++ b/make/modules/jdk.jcmd/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += _options diff --git a/make/modules/jdk.jconsole/Java.gmk b/make/modules/jdk.jconsole/Java.gmk new file mode 100644 index 00000000000..8e38b9419da --- /dev/null +++ b/make/modules/jdk.jconsole/Java.gmk @@ -0,0 +1,29 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .gif .png + +CLEAN_FILES += $(wildcard \ + $(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties) diff --git a/make/modules/jdk.jdeps/Java.gmk b/make/modules/jdk.jdeps/Java.gmk new file mode 100644 index 00000000000..914b0c66587 --- /dev/null +++ b/make/modules/jdk.jdeps/Java.gmk @@ -0,0 +1,30 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .txt + +CLEAN_FILES += $(wildcard \ + $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \ + $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties) diff --git a/make/modules/jdk.jdi/Java.gmk b/make/modules/jdk.jdi/Java.gmk new file mode 100644 index 00000000000..2be905a6092 --- /dev/null +++ b/make/modules/jdk.jdi/Java.gmk @@ -0,0 +1,33 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +EXCLUDES += \ + com/sun/tools/example/debug/bdi \ + com/sun/tools/example/debug/event \ + com/sun/tools/example/debug/gui \ + com/sun/jdi/doc-files \ + # + +EXCLUDE_FILES += jdi-overview.html diff --git a/make/modules/jdk.jfr/Java.gmk b/make/modules/jdk.jfr/Java.gmk new file mode 100644 index 00000000000..c39e21a7173 --- /dev/null +++ b/make/modules/jdk.jfr/Java.gmk @@ -0,0 +1,28 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DISABLED_WARNINGS_java += exports +COPY := .xsd .xml .dtd +JAVAC_FLAGS := -XDstringConcat=inline diff --git a/make/modules/jdk.jpackage/Java.gmk b/make/modules/jdk.jpackage/Java.gmk new file mode 100644 index 00000000000..a0627f2d422 --- /dev/null +++ b/make/modules/jdk.jpackage/Java.gmk @@ -0,0 +1,30 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .gif .png .txt .spec .script .prerm .preinst \ + .postrm .postinst .list .sh .desktop .copyright .control .plist .template \ + .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff + +CLEAN += .properties diff --git a/make/modules/jdk.jshell/Java.gmk b/make/modules/jdk.jshell/Java.gmk new file mode 100644 index 00000000000..a9db351c333 --- /dev/null +++ b/make/modules/jdk.jshell/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .jsh .properties diff --git a/make/modules/jdk.localedata/Java.gmk b/make/modules/jdk.localedata/Java.gmk new file mode 100644 index 00000000000..fde703d7640 --- /dev/null +++ b/make/modules/jdk.localedata/Java.gmk @@ -0,0 +1,30 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += _dict _th +# Exclude BreakIterator classes that are just used in compile process to generate +# data files and shouldn't go in the product +EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java +KEEP_ALL_TRANSLATIONS := true diff --git a/make/modules/jdk.sctp/Java.gmk b/make/modules/jdk.sctp/Java.gmk new file mode 100644 index 00000000000..05e27e1eaf8 --- /dev/null +++ b/make/modules/jdk.sctp/Java.gmk @@ -0,0 +1,46 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# No SCTP implementation on Mac OS X or AIX. These classes should be excluded. +SCTP_IMPL_CLASSES = \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \ + $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java + +ifeq ($(call isTargetOs, macosx), true) + EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) +endif + +ifeq ($(call isTargetOs, aix), true) + EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) +endif diff --git a/make/modules/jdk.unsupported.desktop/Java.gmk b/make/modules/jdk.unsupported.desktop/Java.gmk new file mode 100644 index 00000000000..f892ebeb84c --- /dev/null +++ b/make/modules/jdk.unsupported.desktop/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +DISABLED_WARNINGS_java += missing-explicit-ctor diff --git a/make/modules/sun.charsets/Java.gmk b/make/modules/sun.charsets/Java.gmk new file mode 100644 index 00000000000..2745327c8e4 --- /dev/null +++ b/make/modules/sun.charsets/Java.gmk @@ -0,0 +1,26 @@ +# +# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +COPY += .dat