make/jaxp-rules.gmk
author dfuchs
Mon, 09 Sep 2013 13:59:51 +0200
changeset 19825 a7e79bc2e437
parent 8917 a3bac6e9ee79
permissions -rw-r--r--
8023168: Cleanup LogManager class initialization and LogManager/LoggerContext relationship 8021003: java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java fails intermittently 8019945: test/java/util/logging/LogManagerInstanceTest.java failing intermittently Summary: This fix untangles the class initialization of Logger and LogManager, and also cleans up the relationship between LogManager, LoggerContext, and Logger, which were at the root cause of some intermittent test failures. Reviewed-by: mchung, martin, plevart

#
# Copyright (c) 2001, 2011, 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.
#

################################################################
# JAXP TARGETS
################################################################

JAXP_BUILD_ARGUMENTS = \
   $(COMMON_BUILD_ARGUMENTS) \
   ALT_OUTPUTDIR=$(JAXP_OUTPUTDIR) \
   ALT_BOOTDIR=$(BOOTDIR) \
   ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)

ifeq ($(BUILD_LANGTOOLS), true)
  JAXP_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
endif

jaxp: jaxp-build
jaxp-build:
	$(MKDIR) -p $(JAXP_OUTPUTDIR)
	@$(call MakeStart,jaxp,all)
	($(CD) $(JAXP_TOPDIR)/make && \
	 $(MAKE) $(JAXP_BUILD_ARGUMENTS) all)
	@$(call MakeFinish,jaxp,all)

jaxp-clobber::
	$(MKDIR) -p $(JAXP_OUTPUTDIR)
	@$(call MakeStart,jaxp,clobber)
	($(CD) $(JAXP_TOPDIR)/make &&  \
	 $(MAKE) $(JAXP_BUILD_ARGUMENTS) clobber)
	@$(call MakeFinish,jaxp,clobber)

.PHONY: jaxp jaxp-build jaxp-clobber