OpenJDK / amber / amber
changeset 39611:f39353fa6106
Merge
| author | amurillo |
|---|---|
| date | Thu, 14 Jul 2016 16:21:18 +0000 |
| parents | 64b5a3b857e5 183537aae357 |
| children | 00cf8f38916f |
| files | |
| diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk Thu Jul 14 15:47:44 2016 +0000 +++ b/make/CompileJavaModules.gmk Thu Jul 14 16:21:18 2016 +0000 @@ -409,6 +409,8 @@ ################################################################################ +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)
--- a/make/Javadoc.gmk Thu Jul 14 15:47:44 2016 +0000 +++ b/make/Javadoc.gmk Thu Jul 14 16:21:18 2016 +0000 @@ -424,7 +424,7 @@ @($(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)) ; \
--- a/make/common/MakeBase.gmk Thu Jul 14 15:47:44 2016 +0000 +++ b/make/common/MakeBase.gmk Thu Jul 14 16:21:18 2016 +0000 @@ -801,15 +801,20 @@ # 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