make/corba-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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
fd16c54261b3 Initial load
duke
parents:
diff changeset
     1
#
8917
a3bac6e9ee79 7033660: Update copyright year to 2011 on any files changed in 2011
ohair
parents: 8441
diff changeset
     2
# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
0
fd16c54261b3 Initial load
duke
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
fd16c54261b3 Initial load
duke
parents:
diff changeset
     4
#
fd16c54261b3 Initial load
duke
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
fd16c54261b3 Initial load
duke
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
5499
eb0b3e373167 6943119: Rebrand source copyright notices
ohair
parents: 3792
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
0
fd16c54261b3 Initial load
duke
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
5499
eb0b3e373167 6943119: Rebrand source copyright notices
ohair
parents: 3792
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
0
fd16c54261b3 Initial load
duke
parents:
diff changeset
    10
#
fd16c54261b3 Initial load
duke
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
fd16c54261b3 Initial load
duke
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
fd16c54261b3 Initial load
duke
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
fd16c54261b3 Initial load
duke
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
fd16c54261b3 Initial load
duke
parents:
diff changeset
    15
# accompanied this code).
fd16c54261b3 Initial load
duke
parents:
diff changeset
    16
#
fd16c54261b3 Initial load
duke
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
fd16c54261b3 Initial load
duke
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
fd16c54261b3 Initial load
duke
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
fd16c54261b3 Initial load
duke
parents:
diff changeset
    20
#
5499
eb0b3e373167 6943119: Rebrand source copyright notices
ohair
parents: 3792
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
eb0b3e373167 6943119: Rebrand source copyright notices
ohair
parents: 3792
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
eb0b3e373167 6943119: Rebrand source copyright notices
ohair
parents: 3792
diff changeset
    23
# questions.
0
fd16c54261b3 Initial load
duke
parents:
diff changeset
    24
#
fd16c54261b3 Initial load
duke
parents:
diff changeset
    25
fd16c54261b3 Initial load
duke
parents:
diff changeset
    26
################################################################
fd16c54261b3 Initial load
duke
parents:
diff changeset
    27
# CORBA TARGETS
fd16c54261b3 Initial load
duke
parents:
diff changeset
    28
################################################################
fd16c54261b3 Initial load
duke
parents:
diff changeset
    29
fd16c54261b3 Initial load
duke
parents:
diff changeset
    30
CORBA_BUILD_ARGUMENTS = \
fd16c54261b3 Initial load
duke
parents:
diff changeset
    31
   $(COMMON_BUILD_ARGUMENTS) \
fd16c54261b3 Initial load
duke
parents:
diff changeset
    32
   ALT_OUTPUTDIR=$(CORBA_OUTPUTDIR) \
fd16c54261b3 Initial load
duke
parents:
diff changeset
    33
   ALT_BOOTDIR=$(BOOTDIR) \
fd16c54261b3 Initial load
duke
parents:
diff changeset
    34
   ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
fd16c54261b3 Initial load
duke
parents:
diff changeset
    35
fd16c54261b3 Initial load
duke
parents:
diff changeset
    36
ifeq ($(BUILD_LANGTOOLS), true)
fd16c54261b3 Initial load
duke
parents:
diff changeset
    37
   CORBA_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
fd16c54261b3 Initial load
duke
parents:
diff changeset
    38
endif
fd16c54261b3 Initial load
duke
parents:
diff changeset
    39
fd16c54261b3 Initial load
duke
parents:
diff changeset
    40
corba: corba-build
fd16c54261b3 Initial load
duke
parents:
diff changeset
    41
corba-build:
fd16c54261b3 Initial load
duke
parents:
diff changeset
    42
	$(MKDIR) -p $(CORBA_OUTPUTDIR)
8441
30f5ad688d4a 7021753: Add a build times report
ohrstrom
parents: 5499
diff changeset
    43
	@$(call MakeStart,corba,all)
0
fd16c54261b3 Initial load
duke
parents:
diff changeset
    44
	($(CD) $(CORBA_TOPDIR)/make && \
fd16c54261b3 Initial load
duke
parents:
diff changeset
    45
	 $(MAKE) $(CORBA_BUILD_ARGUMENTS) all)
8441
30f5ad688d4a 7021753: Add a build times report
ohrstrom
parents: 5499
diff changeset
    46
	@$(call MakeFinish,corba,all)
0
fd16c54261b3 Initial load
duke
parents:
diff changeset
    47
fd16c54261b3 Initial load
duke
parents:
diff changeset
    48
corba-clobber::
fd16c54261b3 Initial load
duke
parents:
diff changeset
    49
	$(MKDIR) -p $(CORBA_OUTPUTDIR)
8441
30f5ad688d4a 7021753: Add a build times report
ohrstrom
parents: 5499
diff changeset
    50
	@$(call MakeStart,corba,clobber)
0
fd16c54261b3 Initial load
duke
parents:
diff changeset
    51
	($(CD) $(CORBA_TOPDIR)/make &&  \
fd16c54261b3 Initial load
duke
parents:
diff changeset
    52
	 $(MAKE) $(CORBA_BUILD_ARGUMENTS) clobber)
8441
30f5ad688d4a 7021753: Add a build times report
ohrstrom
parents: 5499
diff changeset
    53
	@$(call MakeFinish,corba,clobber)
0
fd16c54261b3 Initial load
duke
parents:
diff changeset
    54
fd16c54261b3 Initial load
duke
parents:
diff changeset
    55
.PHONY: corba corba-build corba-clobber 
fd16c54261b3 Initial load
duke
parents:
diff changeset
    56