< prev index next >

make/CompileJavaModules.gmk

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2014, 2019, 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 --- 1,7 ---- # ! # Copyright (c) 2014, 2018, 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
*** 36,47 **** $(eval $(call IncludeCustomExtension, CompileJavaModules.gmk)) ################################################################################ # Module specific build settings ! java.base_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline ! java.base_COPY += .icu .dat .spp .nrm content-types.properties hijrah-config-islamic-umalqura.properties java.base_CLEAN += intrinsic.properties java.base_EXCLUDE_FILES += \ $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java --- 36,47 ---- $(eval $(call IncludeCustomExtension, CompileJavaModules.gmk)) ################################################################################ # Module specific build settings ! java.base_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline ! java.base_COPY += .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties java.base_CLEAN += intrinsic.properties java.base_EXCLUDE_FILES += \ $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
*** 218,236 **** java.scripting_COPY += .js java.scripting_CLEAN += .properties ################################################################################ ! java.instrument_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*' ################################################################################ ! java.logging_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*' ################################################################################ ! java.management_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*' ################################################################################ java.management.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:javax.*' --- 218,236 ---- java.scripting_COPY += .js java.scripting_CLEAN += .properties ################################################################################ ! java.instrument_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' ################################################################################ ! java.logging_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' ################################################################################ ! java.management_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' ################################################################################ java.management.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:javax.*'
*** 247,257 **** java.sql_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS ################################################################################ ! java.sql.rowset_ADD_JAVAC_FLAGS += -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) ################################################################################ --- 247,257 ---- java.sql_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS ################################################################################ ! java.sql.rowset_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-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) ################################################################################
*** 261,287 **** $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \ $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties) ################################################################################ ! java.xml_ADD_JAVAC_FLAGS += -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_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*' -Xlint:-exports java.naming_CLEAN += jndiprovider.properties ################################################################################ java.security.jgss_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' ################################################################################ ! java.smartcardio_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*' ################################################################################ java.xml.crypto_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' java.xml.crypto_COPY += .dtd .xml --- 261,287 ---- $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \ $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties) ################################################################################ ! java.xml_ADD_JAVAC_FLAGS += -Xdoclint:all/protected \ '-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_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' -Xlint:-exports java.naming_CLEAN += jndiprovider.properties ################################################################################ java.security.jgss_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' ################################################################################ ! java.smartcardio_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' ################################################################################ java.xml.crypto_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' java.xml.crypto_COPY += .dtd .xml
*** 458,470 **** 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.jdk9.test \ org.graalvm.compiler.hotspot.lir.test \ org.graalvm.compiler.hotspot.sparc.test \ org.graalvm.compiler.hotspot.test \ org.graalvm.compiler.jtt \ org.graalvm.compiler.lir.jtt \ --- 458,468 ----
*** 538,554 **** jdk.jfr_ADD_JAVAC_FLAGS := -XDstringConcat=inline -Xlint:-exports ################################################################################ # If this is an imported module that has prebuilt classes, only compile # module-info.java. ! ifneq ($(IMPORT_MODULES_CLASSES), ) ! IMPORT_MODULE_DIR := $(IMPORT_MODULES_CLASSES)/$(MODULE) ! ifneq ($(wildcard $(IMPORT_MODULE_DIR)), ) ! $(MODULE)_INCLUDE_FILES := module-info.java ! endif ! else ! IMPORT_MODULE_DIR := endif ################################################################################ # Setup the compilation for the module # --- 536,547 ---- jdk.jfr_ADD_JAVAC_FLAGS := -XDstringConcat=inline -Xlint:-exports ################################################################################ # If this is an imported module that has prebuilt classes, only compile # module-info.java. ! ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), ) ! $(MODULE)_INCLUDE_FILES := module-info.java endif ################################################################################ # Setup the compilation for the module #
*** 650,666 **** ################################################################################ # If this is an imported module, copy the pre built classes and resources into # the modules output dir ! ifneq ($(wildcard $(IMPORT_MODULE_DIR)), ) $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \ ! $(call FindFiles, $(IMPORT_MODULE_DIR)) $(call MakeDir, $(@D)) # Do not delete marker and build meta data files $(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*)) ! $(CP) -R $(IMPORT_MODULE_DIR)/* $(@D)/ $(TOUCH) $@ TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker # Add this dependency to avoid a race between compiling module-info.java and --- 643,659 ---- ################################################################################ # If this is an imported module, copy the pre built classes and resources into # the modules output dir ! ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), ) $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \ ! $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE)) $(call MakeDir, $(@D)) # Do not delete marker and build meta data files $(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*)) ! $(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/ $(TOUCH) $@ TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker # Add this dependency to avoid a race between compiling module-info.java and
< prev index next >