Merge
This commit is contained in:
commit
de42a0c056
@ -369,3 +369,4 @@ cae471d3b87783e0a3deea658e1e1c84b2485b6c jdk-9+121
|
||||
f80c841ae2545eaf9acd2724bccc305d98cefbe2 jdk-9+124
|
||||
9aa7d40f3a453f51e47f4c1b19eff5740a74a9f8 jdk-9+125
|
||||
3a58466296d36944454756ef01e7513ac5e14a16 jdk-9+126
|
||||
8fa686245bd2a072ece3392743460030f0854520 jdk-9+127
|
||||
|
@ -409,6 +409,8 @@ jdk.jconsole_CLEAN_FILES := $(wildcard \
|
||||
|
||||
################################################################################
|
||||
|
||||
jdk.jdeps_COPY := .txt
|
||||
|
||||
jdk.jdeps_CLEAN_FILES := $(wildcard \
|
||||
$(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
|
||||
$(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
|
||||
|
@ -424,7 +424,7 @@ $(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
|
||||
@($(call COMMON_JAVADOCFLAGS) ; \
|
||||
$(call COMMON_JAVADOCTAGS) ; \
|
||||
$(call OptionOnly,-Xdoclint:reference) ; \
|
||||
$(call OptionOnly,-Xdoclint/package:-org.omg.*) ; \
|
||||
$(call OptionOnly,-Xdoclint/package:-org.omg.*$(COMMA)jdk.internal.logging.*) ; \
|
||||
$(call OptionPair,-system,none) ; \
|
||||
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
|
||||
$(call OptionPair,-addmods,$(COREAPI_MODULES)) ; \
|
||||
|
@ -801,15 +801,20 @@ endif
|
||||
# of the build in case of failure. The command line itself is stored in a file,
|
||||
# and also logged to stdout if the LOG=cmdlines option has been given.
|
||||
#
|
||||
# NOTE: If the command redirects stdout, the caller needs to wrap it in a
|
||||
# subshell (by adding parentheses around it), otherwise the redirect to the
|
||||
# subshell tee process will create a race condition where the target file may
|
||||
# not be fully written when the make recipe is done.
|
||||
#
|
||||
# Param 1 - The path to base the name of the log file / command line file on
|
||||
# Param 2 - The command to run
|
||||
ExecuteWithLog = \
|
||||
$(call LogCmdlines, Exececuting: [$(strip $2)]) \
|
||||
$(call WriteFile, $2, $(strip $1).cmdline) \
|
||||
( ( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \
|
||||
( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \
|
||||
( exitcode=$(DOLLAR)? && \
|
||||
$(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(BUILD_OUTPUT)/%,%,$(strip $1))).log && \
|
||||
exit $(DOLLAR)exitcode ) ) && wait )
|
||||
exit $(DOLLAR)exitcode ) )
|
||||
|
||||
################################################################################
|
||||
# Find lib dir for module
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2014, 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
|
||||
@ -71,7 +71,6 @@ BOOT_MODULES += \
|
||||
|
||||
# to be deprivileged
|
||||
BOOT_MODULES += \
|
||||
java.smartcardio \
|
||||
jdk.naming.rmi \
|
||||
#
|
||||
|
||||
@ -104,6 +103,7 @@ PLATFORM_MODULES += \
|
||||
PLATFORM_MODULES += \
|
||||
java.compiler \
|
||||
java.scripting \
|
||||
java.smartcardio \
|
||||
java.sql \
|
||||
java.sql.rowset \
|
||||
jdk.accessibility \
|
||||
|
Loading…
x
Reference in New Issue
Block a user