corba/make/CompileCorba.gmk
author lagergren
Thu, 20 Mar 2014 16:16:42 +0100
changeset 24725 7bb1f687a852
parent 22662 ddcb7ce5e63d
child 23067 7b20ffccad89
permissions -rw-r--r--
8033334: Make sure that scope depth information is maintained in the RecompilableScriptFunctionDatas, to avoid unnecessary slow proto linkage when doing on demand compilation Summary: Compute RecompiledScriptFunctionDatas eagerly, annotate them with scope depth information and use them in recompilations. Reviewed-by: attila, hannesw, jlaskey
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     1
#
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
     2
# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     4
#
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    10
#
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    15
# accompanied this code).
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    16
#
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    20
#
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    23
# questions.
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    24
#
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    25
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    26
# This must be the first rule
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    27
default: all
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    28
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    29
include $(SPEC)
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    30
include MakeBase.gmk
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    31
include JavaCompilation.gmk
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    32
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    33
include CommonCorba.gmk
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    34
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    35
################################################################################
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    36
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    37
$(eval $(call SetupJavaCompilation,BUILD_CORBA, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    38
    SETUP := GENERATE_NEWBYTECODE, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    39
    SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    40
    EXCLUDES := com/sun/corba/se/PortableActivationIDL \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    41
        com/sun/tools/corba/se/logutil, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    42
    EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    43
        com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    44
        com/sun/org/omg/CORBA/IDLTypeOperations.java \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    45
        com/sun/org/omg/CORBA/IRObjectOperations.java \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    46
        org/omg/PortableInterceptor/UNKNOWN.java \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    47
        com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    48
        com/sun/corba/se/impl/presentation/rmi/jndi.properties, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    49
    COPY := .prp LogStrings.properties, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    50
    BIN := $(CORBA_OUTPUTDIR)/classes, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    51
    JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    52
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    53
$(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    54
    SETUP := GENERATE_OLDBYTECODE, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    55
    SRC := $(BUILD_CORBA_SRC), \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    56
    EXCLUDES := $(BUILD_CORBA_EXCLUDES), \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    57
    EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    58
    COPY := $(BUILD_CORBA_COPY), \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    59
    BIN := $(CORBA_OUTPUTDIR)/interim_classes, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    60
    JAR := $(INTERIM_CORBA_JAR)))
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    61
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    62
# Separate src.zip call to include sources that were excluded in the build to
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    63
# mimic behavior in old build system.
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    64
$(eval $(call SetupZipArchive,ARCHIVE_CORBA_SRC, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    65
    SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc, \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    66
    ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip))
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    67
    JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    68
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    69
################################################################################
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    70
# Create bin.zip containing the corba specific binaries: orb.idl, ir.idl
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    71
BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    72
    $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    73
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    74
$(CORBA_OUTPUTDIR)/dist/lib/bin.zip: $(BIN_FILES)
20554
7967586cdef6 8001931: The new build system whitespace cleanup
ihse
parents: 15408
diff changeset
    75
	$(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib
7967586cdef6 8001931: The new build system whitespace cleanup
ihse
parents: 15408
diff changeset
    76
	$(MKDIR) -p $(CORBA_OUTPUTDIR)/lib
7967586cdef6 8001931: The new build system whitespace cleanup
ihse
parents: 15408
diff changeset
    77
	$(RM) -f $@
7967586cdef6 8001931: The new build system whitespace cleanup
ihse
parents: 15408
diff changeset
    78
	$(ECHO) Creating `basename $@`
7967586cdef6 8001931: The new build system whitespace cleanup
ihse
parents: 15408
diff changeset
    79
	$(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib
7967586cdef6 8001931: The new build system whitespace cleanup
ihse
parents: 15408
diff changeset
    80
	$(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
7967586cdef6 8001931: The new build system whitespace cleanup
ihse
parents: 15408
diff changeset
    81
	(cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    82
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    83
################################################################################
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    84
14242
0c8f215ed72c 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    85
22662
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    86
all: $(BUILD_CORBA) $(BUILD_INTERIM_CORBA) $(ARCHIVE_CORBA_SRC) \
ddcb7ce5e63d 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 21859
diff changeset
    87
    $(CORBA_OUTPUTDIR)/dist/lib/bin.zip