Merge
This commit is contained in:
J. Duke
commit
0b052af2e8
@ -345,3 +345,4 @@ cf1dc4c035fb84693d4ae5ad818785cb4d1465d1 jdk9-b90
|
||||
c1f30ac14db0eaff398429c04cd9fab92e1b4b2a jdk-9+100
|
||||
c4d72a1620835b5d657b7b6792c2879367d0154f jdk-9+101
|
||||
6406ecf5d39482623225bb1b3098c2cac6f7d450 jdk-9+102
|
||||
47d6462e514b2097663305a57d9c844c15d5b609 jdk-9+103
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -266,14 +266,3 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_BUILD_TWEAKS],
|
||||
HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
|
||||
AC_SUBST(HOTSPOT_MAKE_ARGS)
|
||||
])
|
||||
|
||||
# -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles
|
||||
# will basically do slowdebug builds when DEBUG_BINARIES is set for
|
||||
# fastdebug builds
|
||||
DEBUG_BINARIES=false
|
||||
# Fastdebug builds with this setting will essentially be slowdebug
|
||||
# in hotspot.
|
||||
# -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles
|
||||
# will basically do slowdebug builds when DEBUG_BINARIES is set for
|
||||
# fastdebug builds
|
||||
DEBUG_BINARIES=false
|
||||
@ -144,6 +144,10 @@ AC_DEFUN_ONCE([LIB_SETUP_LLVM],
|
||||
fi
|
||||
done
|
||||
|
||||
# Due to https://llvm.org/bugs/show_bug.cgi?id=16902, llvm does not
|
||||
# always properly detect -ltinfo
|
||||
LLVM_LIBS="${LLVM_LIBS} -ltinfo"
|
||||
|
||||
AC_SUBST(LLVM_CFLAGS)
|
||||
AC_SUBST(LLVM_LDFLAGS)
|
||||
AC_SUBST(LLVM_LIBS)
|
||||
|
||||
@ -500,7 +500,7 @@ JAVAC_FLAGS?=@JAVAC_FLAGS@
|
||||
INTERIM_LANGTOOLS_JAR = $(BUILDTOOLS_OUTPUTDIR)/interim_langtools.jar
|
||||
INTERIM_LANGTOOLS_ARGS = "-Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR)" -cp $(INTERIM_LANGTOOLS_JAR)
|
||||
NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javac.Main
|
||||
NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javadoc.Main
|
||||
NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) jdk.javadoc.internal.tool.Main
|
||||
|
||||
# Base flags for RC
|
||||
# Guarding this against resetting value. Legacy make files include spec multiple
|
||||
|
||||
@ -433,39 +433,22 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
|
||||
# Now we have a compiler binary in $1. Make sure it's okay.
|
||||
BASIC_FIXUP_EXECUTABLE($1)
|
||||
TEST_COMPILER="[$]$1"
|
||||
# Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
|
||||
# to 'xlc' but it is crucial that we invoke the compiler with the right name!
|
||||
if test "x$OPENJDK_BUILD_OS" != xaix; then
|
||||
# FIXME: This test should not be needed anymore; we don't do that for any platform.
|
||||
AC_MSG_CHECKING([resolved symbolic links for $1])
|
||||
BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
|
||||
AC_MSG_RESULT([$TEST_COMPILER])
|
||||
fi
|
||||
AC_MSG_CHECKING([if $1 is disguised ccache])
|
||||
|
||||
COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
|
||||
if test "x$COMPILER_BASENAME" = "xccache"; then
|
||||
AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
|
||||
# We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
|
||||
# We want to control ccache invocation ourselves, so ignore this cc and try
|
||||
# searching again.
|
||||
|
||||
# Remove the path to the fake ccache cc from the PATH
|
||||
RETRY_COMPILER_SAVED_PATH="$PATH"
|
||||
COMPILER_DIRNAME=`$DIRNAME [$]$1`
|
||||
PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
|
||||
|
||||
# Try again looking for our compiler
|
||||
AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3)
|
||||
BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1)
|
||||
PATH="$RETRY_COMPILER_SAVED_PATH"
|
||||
|
||||
AC_MSG_CHECKING([for resolved symbolic links for $1])
|
||||
BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1)
|
||||
AC_MSG_RESULT([$PROPER_COMPILER_$1])
|
||||
$1="$PROPER_COMPILER_$1"
|
||||
AC_MSG_CHECKING([resolved symbolic links for $1])
|
||||
SYMLINK_ORIGINAL="$TEST_COMPILER"
|
||||
BASIC_REMOVE_SYMBOLIC_LINKS(SYMLINK_ORIGINAL)
|
||||
if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then
|
||||
AC_MSG_RESULT([no symlink])
|
||||
else
|
||||
AC_MSG_RESULT([no, keeping $1])
|
||||
AC_MSG_RESULT([$SYMLINK_ORIGINAL])
|
||||
|
||||
# We can't handle ccache by gcc wrappers, since we need to know if we're
|
||||
# using ccache. Instead ccache usage must be controlled by a configure option.
|
||||
COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"`
|
||||
if test "x$COMPILER_BASENAME" = "xccache"; then
|
||||
AC_MSG_NOTICE([Please use --enable-ccache instead of providing a wrapped compiler.])
|
||||
AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not supported.])
|
||||
fi
|
||||
fi
|
||||
|
||||
TOOLCHAIN_CHECK_COMPILER_VERSION([$1], [$COMPILER_NAME])
|
||||
|
||||
@ -306,7 +306,7 @@ compare_general_files() {
|
||||
! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \
|
||||
! -name "*.obj" ! -name "*.o" ! -name "JavaControlPanelHelper" \
|
||||
! -name "JavaUpdater" ! -name "JavaWSApplicationStub" \
|
||||
! -name "jspawnhelper" \
|
||||
! -name "jspawnhelper" ! -name "*.a" \
|
||||
| $GREP -v "./bin/" | $SORT | $FILTER)
|
||||
|
||||
echo Other files with binary differences...
|
||||
@ -939,7 +939,7 @@ compare_all_libs() {
|
||||
WORK_DIR=$3
|
||||
|
||||
LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' \
|
||||
-o -name '*.dll' -o -name '*.obj' -o -name '*.o' \
|
||||
-o -name '*.dll' -o -name '*.obj' -o -name '*.o' -o -name '*.a' \
|
||||
-o -name '*.cpl' \) | $SORT | $FILTER)
|
||||
|
||||
if [ -n "$LIBS" ]; then
|
||||
|
||||
@ -42,7 +42,7 @@ java.activation_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
|
||||
|
||||
################################################################################
|
||||
|
||||
java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
|
||||
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
|
||||
|
||||
@ -359,7 +359,7 @@ jdk.charsets_COPY := .dat
|
||||
|
||||
################################################################################
|
||||
|
||||
jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*'
|
||||
jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*' -XDstringConcat=inline
|
||||
jdk.compiler_COPY := javax.tools.JavaCompilerTool
|
||||
jdk.compiler_CLEAN_FILES := $(wildcard \
|
||||
$(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
|
||||
|
||||
@ -315,6 +315,7 @@ else # HAS_SPEC=true
|
||||
|
||||
# Support targets for COMPARE_BUILD, used for makefile development
|
||||
pre-compare-build:
|
||||
$(call WaitForSmartJavacFinish)
|
||||
$(call PrepareCompareBuild)
|
||||
|
||||
post-compare-build:
|
||||
|
||||
@ -440,7 +440,10 @@ else # $(HAS_SPEC)=true
|
||||
$(PRINTF) "=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \
|
||||
$(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*)), \
|
||||
$(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" $(NEWLINE) \
|
||||
$(CAT) $(logfile) | $(GREP) -v -e "^Note: including file:" $(NEWLINE) \
|
||||
($(GREP) -v -e "^Note: including file:" < $(logfile) || true) | $(HEAD) -n 12 $(NEWLINE) \
|
||||
if test `$(WC) -l < $(logfile)` -gt 12; then \
|
||||
$(ECHO) " ... (rest of output omitted)" ; \
|
||||
fi $(NEWLINE) \
|
||||
) \
|
||||
$(PRINTF) "=== End of repeated output ===\n" \
|
||||
)
|
||||
@ -486,6 +489,21 @@ else # $(HAS_SPEC)=true
|
||||
$(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
|
||||
endef
|
||||
|
||||
ifeq ($(OPENJDK_BUILD_OS), windows)
|
||||
# On windows we need to synchronize with the javac server to be able to
|
||||
# move or remove the build output directory. Since we have no proper
|
||||
# synchronization process, wait for a while and hope it helps. This is only
|
||||
# used by build comparisons.
|
||||
define WaitForSmartJavacFinish
|
||||
$(if $(SJAVAC_SERVER_DIR), \
|
||||
sleep 5\
|
||||
)
|
||||
endef
|
||||
else
|
||||
define WaitForSmartJavacFinish
|
||||
endef
|
||||
endif
|
||||
|
||||
define StartGlobalTimer
|
||||
$(RM) -r $(BUILDTIMESDIR) 2> /dev/null && \
|
||||
$(MKDIR) -p $(BUILDTIMESDIR) && \
|
||||
|
||||
118
make/Javadoc.gmk
118
make/Javadoc.gmk
@ -76,6 +76,7 @@ SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
|
||||
TRACING_FIRST_COPYRIGHT_YEAR = 2008
|
||||
TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
|
||||
NASHORNAPI_FIRST_COPYRIGHT_YEAR = 2014
|
||||
DYNALINKAPI_FIRST_COPYRIGHT_YEAR = 2015
|
||||
JNLP_FIRST_COPYRIGHT_YEAR = 1998
|
||||
PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
|
||||
JDKNET_FIRST_COPYRIGHT_YEAR = 2014
|
||||
@ -418,7 +419,7 @@ DOCLETAPI_WINDOWTITLE := Doclet API
|
||||
DOCLETAPI_HEADER := <strong>Doclet API</strong>
|
||||
DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
|
||||
DOCLETAPI_GROUPNAME := Packages
|
||||
DOCLETAPI_REGEXP := com.sun.javadoc
|
||||
DOCLETAPI_REGEXP := jdk.javadoc.doclet.*
|
||||
# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
|
||||
|
||||
# The index.html, options, and packages files
|
||||
@ -460,14 +461,71 @@ $(DOCLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(DOCLETAPI_PKGS))
|
||||
$(prep-target)
|
||||
$(call PackageFilter,$(DOCLETAPI_PKGS))
|
||||
|
||||
#############################################################
|
||||
#
|
||||
# old docletapidocs
|
||||
#
|
||||
|
||||
ALL_OTHER_TARGETS += olddocletapidocs
|
||||
|
||||
OLD_DOCLET_DIR := $(JDK_API_DOCSDIR)/javadoc/old
|
||||
OLD_DOCLETAPI_DOCDIR := $(OLD_DOCLET_DIR)/doclet
|
||||
OLD_DOCLETAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
|
||||
OLD_DOCLETAPI_DOCTITLE := Doclet API
|
||||
OLD_DOCLETAPI_WINDOWTITLE := Doclet API
|
||||
OLD_DOCLETAPI_HEADER := <strong>Doclet API</strong>
|
||||
OLD_DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
|
||||
OLD_DOCLETAPI_GROUPNAME := Packages
|
||||
OLD_DOCLETAPI_REGEXP := com.sun.javadoc
|
||||
# OLD_DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
|
||||
|
||||
# The index.html, options, and packages files
|
||||
OLD_DOCLETAPI_INDEX_FILE = $(OLD_DOCLETAPI_DOCDIR)/index.html
|
||||
OLD_DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/old-docletapi.options
|
||||
OLD_DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/old-docletapi.packages
|
||||
|
||||
olddocletapidocs: $(OLD_DOCLETAPI_INDEX_FILE)
|
||||
|
||||
# Set relative location to core api document root
|
||||
$(OLD_DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(OLD_DOCLETAPI2COREAPI)/..
|
||||
|
||||
# Run javadoc if the index file is out of date or missing
|
||||
$(OLD_DOCLETAPI_INDEX_FILE): $(OLD_DOCLETAPI_OPTIONS_FILE) $(OLD_DOCLETAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
|
||||
$(prep-javadoc)
|
||||
$(call JavadocSummary,$(OLD_DOCLETAPI_OPTIONS_FILE),$(OLD_DOCLETAPI_PACKAGES_FILE))
|
||||
$(JAVADOC_CMD_SMALL) -d $(@D) \
|
||||
@$(OLD_DOCLETAPI_OPTIONS_FILE) @$(OLD_DOCLETAPI_PACKAGES_FILE)
|
||||
|
||||
# Create file with javadoc options in it
|
||||
$(OLD_DOCLETAPI_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(call COMMON_JAVADOCFLAGS) ; \
|
||||
$(call COMMON_JAVADOCTAGS) ; \
|
||||
$(call OptionOnly,-Xdoclint:all) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-breakiterator) ; \
|
||||
$(call OptionPair,-doctitle,$(OLD_DOCLETAPI_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(OLD_DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
|
||||
$(call OptionPair,-header,$(OLD_DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(OLD_DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-group,$(OLD_DOCLETAPI_GROUPNAME),$(OLD_DOCLETAPI_REGEXP)); \
|
||||
$(call OptionTrip,-linkoffline,$(OLD_DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
$(OLD_DOCLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(OLD_DOCLETAPI_PKGS))
|
||||
$(prep-target)
|
||||
$(call PackageFilter,$(OLD_DOCLETAPI_PKGS))
|
||||
|
||||
#############################################################
|
||||
#
|
||||
# tagletapidocs
|
||||
#
|
||||
|
||||
ALL_OTHER_TARGETS += tagletapidocs
|
||||
TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
|
||||
TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
|
||||
TAGLETAPI_DOCDIR := $(OLD_DOCLET_DIR)/taglet
|
||||
TAGLETAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
|
||||
TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
|
||||
# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
|
||||
|
||||
@ -1156,6 +1214,60 @@ $(NASHORNAPI_PACKAGES_FILE): $(call PackageDependencies,$(NASHORNAPI_PKGS))
|
||||
$(prep-target)
|
||||
$(call PackageFilter,$(NASHORNAPI_PKGS))
|
||||
|
||||
#############################################################
|
||||
#
|
||||
# dynalinkapidocs
|
||||
#
|
||||
|
||||
ALL_OTHER_TARGETS += dynalinkapidocs
|
||||
|
||||
DYNALINKAPI_DOCDIR := $(JDK_API_DOCSDIR)/dynalink
|
||||
DYNALINKAPI2COREAPI := ../$(JDKJRE2COREAPI)
|
||||
DYNALINKAPI_DOCTITLE := Dynalink API
|
||||
DYNALINKAPI_WINDOWTITLE := Dynalink API
|
||||
DYNALINKAPI_HEADER := <strong>Dynalink API</strong>
|
||||
DYNALINKAPI_BOTTOM := $(call CommonBottom,$(DYNALINKAPI_FIRST_COPYRIGHT_YEAR))
|
||||
DYNALINKAPI_GROUPNAME := Packages
|
||||
DYNALINKAPI_REGEXP := jdk.dynalink.*
|
||||
# DYNALINKAPI_PKGS is located in NON_CORE_PKGS.gmk
|
||||
|
||||
DYNALINKAPI_INDEX_HTML = $(DYNALINKAPI_DOCDIR)/index.html
|
||||
DYNALINKAPI_OPTIONS_FILE = $(DOCSTMPDIR)/dynalinkapi.options
|
||||
DYNALINKAPI_PACKAGES_FILE = $(DOCSTMPDIR)/dynalinkapi.packages
|
||||
|
||||
dynalinkapidocs: $(DYNALINKAPI_INDEX_HTML)
|
||||
|
||||
# Set relative location to core api document root
|
||||
$(DYNALINKAPI_INDEX_HTML): GET2DOCSDIR=$(DYNALINKAPI2COREAPI)/..
|
||||
|
||||
# Run javadoc if the index file is out of date or missing
|
||||
$(DYNALINKAPI_INDEX_HTML): $(DYNALINKAPI_OPTIONS_FILE) $(DYNALINKAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
|
||||
$(prep-javadoc)
|
||||
$(call JavadocSummary,$(DYNALINKAPI_OPTIONS_FILE),$(DYNALINKAPI_PACKAGES_FILE))
|
||||
$(JAVADOC_CMD_SMALL) -d $(@D) \
|
||||
@$(DYNALINKAPI_OPTIONS_FILE) @$(DYNALINKAPI_PACKAGES_FILE)
|
||||
|
||||
# Create file with javadoc options in it
|
||||
$(DYNALINKAPI_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(call COMMON_JAVADOCFLAGS) ; \
|
||||
$(call COMMON_JAVADOCTAGS) ; \
|
||||
$(call OptionOnly,-Xdoclint:all) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionPair,-doctitle,$(DYNALINKAPI_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(DYNALINKAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
|
||||
$(call OptionPair,-header,$(DYNALINKAPI_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(DYNALINKAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-group,$(DYNALINKAPI_GROUPNAME),$(DYNALINKAPI_REGEXP)); \
|
||||
$(call OptionTrip,-linkoffline,$(DYNALINKAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
$(DYNALINKAPI_PACKAGES_FILE): $(call PackageDependencies,$(DYNALINKAPI_PKGS))
|
||||
$(prep-target)
|
||||
$(call PackageFilter,$(DYNALINKAPI_PKGS))
|
||||
|
||||
#############################################################
|
||||
#
|
||||
# sctpdocs
|
||||
|
||||
@ -345,7 +345,7 @@ define SetupJavaCompilationBody
|
||||
$$(eval $$(call ListPathsSafely,$1_SJAVAC_ARGS_STRING, $$($1_SJAVAC_ARGS_FILE)))
|
||||
endif
|
||||
$(ECHO) Compiling $1
|
||||
$(call LogFailures, $$($1_BIN)/_the.$$($1_SAFE_NAME)_batch.log, $$($1_SAFE_NAME), \
|
||||
$(call LogFailures, $$($1_BIN)/_the.$$($1_SAFE_NAME)_batch, $$($1_SAFE_NAME), \
|
||||
$$($1_JVM) $$($1_SJAVAC) \
|
||||
$$($1_REMOTE) \
|
||||
-j 1 \
|
||||
@ -409,7 +409,7 @@ define SetupJavaCompilationBody
|
||||
$(MKDIR) -p $$(@D)
|
||||
$$(eval $$(call ListPathsSafely,$1_SRCS, $$@.tmp))
|
||||
$(ECHO) Compiling `$(WC) $$@.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
|
||||
$(call LogFailures, $$($1_BIN)/_the.$$($1_SAFE_NAME)_batch.log, $$($1_SAFE_NAME), \
|
||||
$(call LogFailures, $$($1_BIN)/_the.$$($1_SAFE_NAME)_batch, $$($1_SAFE_NAME), \
|
||||
$$($1_JVM) $$($1_JAVAC_CMD) $$($1_FLAGS) \
|
||||
-implicit:none \
|
||||
-d $$($1_BIN) $$($1_HEADERS_ARG) @$$@.tmp) && \
|
||||
|
||||
@ -685,14 +685,15 @@ DependOnVariable = \
|
||||
# LogFailures will run a command and store a copy of output in a specified file.
|
||||
# If the command succeeds, the file is deleted, otherwise it is moved to the
|
||||
# failure-logs directory.
|
||||
# Param 1 - The log file of the failed command
|
||||
# Param 1 - The base name of the log file / command line file
|
||||
# Param 2 - A compact but representative name to describe this command
|
||||
# Param 3 - Command to run
|
||||
LogFailures = \
|
||||
( $3 > >($(TEE) $1) 2> >($(TEE) $1 >&2) || \
|
||||
( $(ECHO) '$3' > $1.cmdline && \
|
||||
( $3 > >($(TEE) $1.log) 2> >($(TEE) $1.log >&2) || \
|
||||
(exitcode=$(DOLLAR)$(DOLLAR)? && \
|
||||
$(CP) $1 $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(strip $2).log && \
|
||||
exit $(DOLLAR)$(DOLLAR)exitcode) )
|
||||
$(CP) $1.log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(strip $2).log && \
|
||||
exit $(DOLLAR)$(DOLLAR)exitcode) ) )
|
||||
|
||||
################################################################################
|
||||
# Find lib dir for module
|
||||
|
||||
@ -66,7 +66,10 @@ HTTPSERVER_PKGS = com.sun.net.httpserver \
|
||||
|
||||
NIO_PKGS = com.sun.nio.file
|
||||
|
||||
DOCLETAPI_PKGS = com.sun.javadoc
|
||||
OLD_DOCLETAPI_PKGS = com.sun.javadoc
|
||||
|
||||
DOCLETAPI_PKGS = jdk.javadoc.doclet \
|
||||
jdk.javadoc.doclet.taglet
|
||||
|
||||
TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
|
||||
|
||||
@ -83,6 +86,12 @@ TREEAPI_PKGS = com.sun.source.doctree \
|
||||
|
||||
NASHORNAPI_PKGS = jdk.nashorn.api.scripting \
|
||||
jdk.nashorn.api.tree
|
||||
|
||||
DYNALINKAPI_PKGS = jdk.dynalink \
|
||||
jdk.dynalink.beans \
|
||||
jdk.dynalink.linker \
|
||||
jdk.dynalink.linker.support \
|
||||
jdk.dynalink.support
|
||||
|
||||
SMARTCARDIO_PKGS = javax.smartcardio
|
||||
|
||||
|
||||
@ -241,15 +241,16 @@ define add_native_source
|
||||
|
||||
$$($1_$2_OBJ) : $2 $$($1_COMPILE_VARDEPS_FILE) $$($1_$2_VARDEPS_FILE) | $$($1_BUILD_INFO)
|
||||
$$(call LogInfo, Compiling $$(notdir $2) (for $$(notdir $$($1_TARGET))))
|
||||
$$(call MakeDir, $$(@D))
|
||||
ifneq ($(TOOLCHAIN_TYPE), microsoft)
|
||||
ifeq ($(TOOLCHAIN_TYPE)$$(filter %.s,$2), solstudio)
|
||||
# The Solaris studio compiler doesn't output the full path to the object file in the
|
||||
# generated deps files. Fixing it with sed. If compiling assembly, don't try this.
|
||||
$(call LogFailures, $$($1_$2_OBJ).log, $$($1_SAFE_NAME)_$$(notdir $2), \
|
||||
$(call LogFailures, $$($1_$2_OBJ), $$($1_SAFE_NAME)_$$(notdir $2), \
|
||||
$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2)
|
||||
$(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP)
|
||||
else
|
||||
$(call LogFailures, $$($1_$2_OBJ).log, $$($1_SAFE_NAME)_$$(notdir $2), \
|
||||
$(call LogFailures, $$($1_$2_OBJ), $$($1_SAFE_NAME)_$$(notdir $2), \
|
||||
$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2)
|
||||
endif
|
||||
# Create a dependency target file from the dependency file.
|
||||
@ -264,7 +265,7 @@ define add_native_source
|
||||
# Keep as much as possible on one execution line for best performance on Windows.
|
||||
# No need to save exit code from compilation since pipefail is always active on
|
||||
# Windows.
|
||||
$(call LogFailures, $$($1_$2_OBJ).log, $$($1_SAFE_NAME)_$$(notdir $2), \
|
||||
$(call LogFailures, $$($1_$2_OBJ), $$($1_SAFE_NAME)_$$(notdir $2), \
|
||||
$$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
|
||||
$(CC_OUT_OPTION)$$($1_$2_OBJ) $2) \
|
||||
| $(GREP) -v -e "^Note: including file:" \
|
||||
@ -784,13 +785,23 @@ define SetupNativeCompilationBody
|
||||
# Keep as much as possible on one execution line for best performance
|
||||
# on Windows
|
||||
$$(call LogInfo, Linking $$($1_BASENAME))
|
||||
$(call LogFailures, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link.log, $$($1_SAFE_NAME)_link, \
|
||||
$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
|
||||
$(LD_OUT_OPTION)$$@ \
|
||||
$$($1_LD_OBJ_ARG) $$($1_RES) \
|
||||
$$($1_LIBS) $$($1_EXTRA_LIBS)) ; \
|
||||
$$($1_CREATE_DEBUGINFO_CMDS)
|
||||
$$($1_STRIP_CMD)
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
$(call LogFailures, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, $$($1_SAFE_NAME)_link, \
|
||||
$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
|
||||
$(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$($1_LIBS) \
|
||||
$$($1_EXTRA_LIBS)) \
|
||||
| $(GREP) -v "^ Creating library .*\.lib and object .*\.exp" || \
|
||||
test "$$$$?" = "1" ; \
|
||||
$$($1_CREATE_DEBUGINFO_CMDS)
|
||||
$$($1_STRIP_CMD)
|
||||
else
|
||||
$(call LogFailures, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, $$($1_SAFE_NAME)_link, \
|
||||
$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
|
||||
$(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$($1_LIBS) \
|
||||
$$($1_EXTRA_LIBS)) ; \
|
||||
$$($1_CREATE_DEBUGINFO_CMDS)
|
||||
$$($1_STRIP_CMD)
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
@ -803,7 +814,7 @@ define SetupNativeCompilationBody
|
||||
# Generating a static library, ie object file archive.
|
||||
$$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_VARDEPS_FILE)
|
||||
$$(call LogInfo, Archiving $$($1_STATIC_LIBRARY))
|
||||
$(call LogFailures, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link.log, $$($1_SAFE_NAME)_link, \
|
||||
$(call LogFailures, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, $$($1_SAFE_NAME)_link, \
|
||||
$$($1_AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_ALL_OBJS) \
|
||||
$$($1_RES))
|
||||
ifeq ($(STATIC_BUILD), true)
|
||||
@ -825,7 +836,7 @@ define SetupNativeCompilationBody
|
||||
$$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_MANIFEST) \
|
||||
$$($1_VARDEPS_FILE)
|
||||
$$(call LogInfo, Linking executable $$($1_BASENAME))
|
||||
$(call LogFailures, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link.log, $$($1_SAFE_NAME)_link, \
|
||||
$(call LogFailures, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, $$($1_SAFE_NAME)_link, \
|
||||
$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
|
||||
$(EXE_OUT_OPTION)$$($1_TARGET) \
|
||||
$$($1_ALL_OBJS) $$($1_RES) \
|
||||
|
||||
@ -55,7 +55,7 @@ $(eval $(call SetupJavaCompiler,BOOT_JAVAC, \
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
|
||||
JVM := $(JAVA_SMALL), \
|
||||
JAVAC := $(NEW_JAVAC), \
|
||||
FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true \
|
||||
FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true -XDstringConcat=inline \
|
||||
$(DISABLE_WARNINGS) -Xlint:-options, \
|
||||
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
|
||||
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
|
||||
|
||||
16
modules.xml
16
modules.xml
@ -2,7 +2,7 @@
|
||||
|
||||
<!--
|
||||
|
||||
Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
Copyright (c) 2014, 2016, 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
|
||||
@ -1643,6 +1643,10 @@
|
||||
<to>jdk.javadoc</to>
|
||||
<to>jdk.jdeps</to>
|
||||
</export>
|
||||
<export>
|
||||
<name>com.sun.tools.javac.model</name>
|
||||
<to>jdk.javadoc</to>
|
||||
</export>
|
||||
</module>
|
||||
<module>
|
||||
<name>jdk.crypto.ec</name>
|
||||
@ -1743,6 +1747,10 @@
|
||||
<to>jdk.scripting.nashorn.shell</to>
|
||||
</export>
|
||||
</module>
|
||||
<module>
|
||||
<name>jdk.internal.opt</name>
|
||||
<depend>java.base</depend>
|
||||
</module>
|
||||
<module>
|
||||
<name>jdk.jartool</name>
|
||||
<depend>java.base</depend>
|
||||
@ -1768,6 +1776,12 @@
|
||||
<export>
|
||||
<name>com.sun.tools.javadoc</name>
|
||||
</export>
|
||||
<export>
|
||||
<name>jdk.javadoc.doclet</name>
|
||||
</export>
|
||||
<export>
|
||||
<name>jdk.javadoc.doclet.taglet</name>
|
||||
</export>
|
||||
</module>
|
||||
<module>
|
||||
<name>jdk.jcmd</name>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user