jdk/makefiles/CompileJavaClasses.gmk
author erikj
Fri, 05 Apr 2013 09:39:10 +0200
changeset 16636 1cc691bcfe50
parent 15334 19ab20cb461f
child 17922 d56eec572de5
permissions -rw-r--r--
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar' Reviewed-by: tbell
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     2
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    26
default: all
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
include $(SPEC)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
include MakeBase.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
include JavaCompilation.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    31
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    32
# Setup the java compilers for the JDK build.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    33
include Setup.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    34
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    35
JARS :=
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    36
EXFILES :=
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    37
EXCLUDES :=
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    38
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    39
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    40
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    41
EXCLUDES +=	com/sun/pept \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    42
		com/sun/tools/example/trace\
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
		com/sun/tools/example/debug/bdi\
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    44
		com/sun/tools/example/debug/event\
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 14708
diff changeset
    45
		com/sun/tools/example/debug/gui
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    46
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    47
ifdef OPENJDK
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    48
    EXCLUDES+=	sun/dc \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    49
		com/sun/jmx/snmp \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    50
		sun/management/snmp \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    51
		com/sun/script
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    52
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    53
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    54
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    55
   # There exists two versions of this file...
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    56
   EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
    57
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
    58
   ifeq ($(OPENJDK_TARGET_OS),windows)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
    59
      # This gets built on unix platforms implicitly in the old build even though
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
    60
      # it's excluded in the closed build.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
    61
      EXCLUDES+=sun/java2d/pisces
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
    62
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
    63
      # AccessBridge is compiled separately below.
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
    64
      EXFILES += AccessBridge.java \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
    65
		 com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
    66
      # This seems to never be built
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
    67
      EXCLUDES += com/sun/java/accessibility/extensions
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
    68
   endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
    69
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    70
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    71
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
    72
ifneq ($(OPENJDK_TARGET_OS),solaris)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    73
   # Exclude Solaris nio and two security related files in src/share/classes
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    74
   EXFILES += SolarisAclFileAttributeView.java \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    75
	SolarisFileStore.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    76
	SolarisFileSystem.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    77
	SolarisFileSystemProvider.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    78
	SolarisNativeDispatcher.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    79
	SolarisUserDefinedFileAttributeView.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    80
	SolarisWatchService.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    81
	SolarisAclFileAttributeView.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    82
	SolarisLoginModule.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    83
	SolarisSystem.java \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    84
        sun/nio/ch/DevPollArrayWrapper.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    85
        sun/nio/ch/DevPollSelectorImpl.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    86
        sun/nio/ch/DevPollSelectorProvider.java \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
    87
	sun/nio/ch/EventPortSelectorImpl.java \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
    88
	sun/nio/ch/EventPortSelectorProvider.java \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
    89
	sun/nio/ch/EventPortWrapper.java \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    90
        sun/nio/ch/SolarisAsynchronousChannelProvider.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    91
        sun/nio/ch/SolarisEventPort.java \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    92
	sun/tools/attach/SolarisAttachProvider.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    93
	sun/tools/attach/SolarisVirtualMachine.java
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 14708
diff changeset
    94
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 14708
diff changeset
    95
   EXCLUDES += com/oracle/security
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    96
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    97
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    98
# In the old build, this isn't excluded on macosx, even though it probably
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    99
# should be.
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   100
ifneq ($(OPENJDK_TARGET_OS),macosx)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   101
	EXFILES+=WrapperGenerator.java
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   102
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   103
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   104
ifneq ($(OPENJDK_TARGET_OS),windows)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   105
    # Exclude Window security related files in src/share/classes
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   106
    EXFILES+=NTLoginModule.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   107
             NTSystem.java
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   108
else
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   109
    EXFILES+=UnixLoginModule.java \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   110
	     UnixSystem.java
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   111
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   112
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   113
ifeq ($(OPENJDK_TARGET_OS),windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   114
    # Don't build GTK L&F on Windows
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   115
    EXCLUDES+=com/sun/java/swing/plaf/gtk
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   116
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   117
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   118
ifneq ($(OPENJDK_TARGET_OS),linux)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   119
    EXFILES+=sun/tools/attach/LinuxAttachProvider.java \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   120
	     sun/tools/attach/LinuxVirtualMachine.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   121
             sun/nio/ch/EPoll.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   122
             sun/nio/ch/EPollArrayWrapper.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   123
             sun/nio/ch/EPollPort.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   124
             sun/nio/ch/EPollSelectorImpl.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   125
             sun/nio/ch/EPollSelectorProvider.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   126
             sun/nio/ch/LinuxAsynchronousChannelProvider.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   127
	     sun/nio/fs/LinuxDosFileAttributeView.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   128
	     sun/nio/fs/LinuxFileStore.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   129
	     sun/nio/fs/LinuxFileSystem.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   130
	     sun/nio/fs/LinuxFileSystemProvider.java \
14702
111342b28e67 7142921: (fs) Files.probeContentType reports a MIME type of "text/plain" on Ubuntu 11.04
dxu
parents: 14345
diff changeset
   131
	     sun/nio/fs/MagicFileTypeDetector.java \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   132
	     sun/nio/fs/LinuxNativeDispatcher.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   133
	     sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   134
	     sun/nio/fs/LinuxWatchService.java
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   135
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   136
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   137
ifneq ($(OPENJDK_TARGET_OS),macosx)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   138
    EXFILES+=sun/nio/ch/BsdAsynchronousChannelProvider.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   139
             sun/nio/ch/KQueue.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   140
             sun/nio/ch/KQueuePort.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   141
             sun/nio/fs/BsdFileStore.java \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   142
	     sun/nio/fs/BsdFileSystem.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   143
             sun/nio/fs/BsdFileSystemProvider.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   144
             sun/nio/fs/BsdNativeDispatcher.java \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   145
             sun/nio/fs/MacOSXFileSystemProvider.java \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   146
             sun/nio/fs/MacOSXFileSystem.java \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   147
             sun/nio/fs/MacOSXNativeDispatcher.java \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   148
             sun/tools/attach/BsdAttachProvider.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   149
             sun/tools/attach/BsdVirtualMachine.java
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   150
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   151
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   152
# Exclude BreakIterator classes that are just used in compile process to generate
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   153
# data files and shouldn't go in the product
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   154
EXFILES+=sun/text/resources/BreakIteratorRules.java \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   155
	 sun/text/resources/BreakIteratorRules_th.java
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   156
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   157
# TODO: Add BUILD_HEADLESS_ONLY to configure?
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   158
ifdef BUILD_HEADLESS_ONLY
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   159
    EXCLUDES+=sun/applet
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   160
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   161
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   162
ifdef OPENJDK
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   163
    EXCLUDES+=sun/java2d/cmm/kcms
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   164
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   165
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   166
# Used on windows and macosx
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   167
ifeq (,$(filter $(OPENJDK_TARGET_OS), windows macosx))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   168
    EXFILES+=sun/awt/AWTCharset.java
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   169
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   170
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   171
ifneq ($(OPENJDK_TARGET_OS), macosx)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   172
    EXFILES+=sun/awt/X11/ScreenFormat.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   173
             sun/awt/X11/XArc.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   174
             sun/awt/X11/XChar2b.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   175
             sun/awt/X11/XCharStruct.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   176
             sun/awt/X11/XClassHint.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   177
             sun/awt/X11/XComposeStatus.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   178
             sun/awt/X11/XExtCodes.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   179
             sun/awt/X11/XFontProp.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   180
             sun/awt/X11/XFontSetExtents.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   181
             sun/awt/X11/XFontStruct.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   182
             sun/awt/X11/XGCValues.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   183
             sun/awt/X11/XHostAddress.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   184
             sun/awt/X11/XIMCallback.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   185
             sun/awt/X11/XIMHotKeyTrigger.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   186
             sun/awt/X11/XIMHotKeyTriggers.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   187
             sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   188
             sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   189
             sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   190
             sun/awt/X11/XIMStatusDrawCallbackStruct.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   191
             sun/awt/X11/XIMStringConversionCallbackStruct.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   192
             sun/awt/X11/XIMStringConversionText.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   193
             sun/awt/X11/XIMStyles.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   194
             sun/awt/X11/XIMText.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   195
             sun/awt/X11/XIMValuesList.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   196
             sun/awt/X11/XImage.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   197
             sun/awt/X11/XKeyboardControl.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   198
             sun/awt/X11/XKeyboardState.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   199
             sun/awt/X11/XOMCharSetList.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   200
             sun/awt/X11/XOMFontInfo.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   201
             sun/awt/X11/XOMOrientation.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   202
             sun/awt/X11/XPoint.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   203
             sun/awt/X11/XRectangle.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   204
             sun/awt/X11/XSegment.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   205
             sun/awt/X11/XStandardColormap.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   206
             sun/awt/X11/XTextItem.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   207
             sun/awt/X11/XTextItem16.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   208
             sun/awt/X11/XTextProperty.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   209
             sun/awt/X11/XTimeCoord.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   210
             sun/awt/X11/XWindowChanges.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   211
             sun/awt/X11/XdbeSwapInfo.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   212
             sun/awt/X11/XmbTextItem.java \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   213
             sun/awt/X11/XwcTextItem.java
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   214
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   215
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   216
# Exclude another implicitly not included file.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   217
EXFILES+=sun/util/locale/AsciiUtil.java
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   218
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   219
ifeq (,$(filter $(OPENJDK_TARGET_OS), solaris macosx))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   220
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   221
# only solaris and macosx
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   222
#
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   223
    EXFILES+=sun/nio/fs/PollingWatchService.java
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   224
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   225
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   226
# TODO: Fix when converting NIO
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   227
# Exclude *-linux-arm.java and *-linux-ppc.java from closed.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   228
EXFILES+=-linux-arm.java \
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   229
	 -linux-ppc.java
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   230
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   231
ifeq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   232
    EXFILES+=sun/nio/ch/AbstractPollSelectorImpl.java \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   233
        sun/nio/ch/PollSelectorProvider.java \
14706
0651f78051e0 8004104: build-infra: Minor cleanup
erikj
parents: 14596
diff changeset
   234
	sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   235
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   236
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   237
# These files do not appear in the build result of the old build. This
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   238
# is because they are generated sources, but the AUTO_JAVA_FILES won't
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   239
# pick them up since they aren't generated when the source dirs are 
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   240
# searched and they aren't referenced by any other classes so they won't
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   241
# be picked up by implicit compilation. On a rebuild, they are picked up
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   242
# and compiled. Exclude them here to produce the same rt.jar as the old 
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   243
# build does when building just once.
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   244
EXFILES+=javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   245
	 javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   246
	 javax/swing/plaf/nimbus/ScrollBarPainter.java \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   247
	 javax/swing/plaf/nimbus/SliderPainter.java \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   248
	 javax/swing/plaf/nimbus/SpinnerPainter.java \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   249
	 javax/swing/plaf/nimbus/SplitPanePainter.java \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   250
	 javax/swing/plaf/nimbus/TabbedPanePainter.java
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   251
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   252
# Acquire a list of files that should be copied straight over to the classes.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   253
include CopyIntoClasses.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   254
# Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   255
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   256
ifndef OPENJDK
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   257
    CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   258
		     $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   259
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   260
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   261
MACOSX_SRC_DIRS :=
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   262
ifeq ($(OPENJDK_TARGET_OS),macosx)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   263
     MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   264
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   265
     # this files are duplicated in MACOSX_SRC_DIRS
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   266
     EXFILES+= $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   267
               $(JDK_TOPDIR)/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   268
               $(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \
13586
31ba61c73020 7193601: Build breakage with the fix to 6336885 (build-infra build)
naoto
parents: 13164
diff changeset
   269
               $(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   270
               $(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   271
               $(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   272
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   273
     # JObjC.jar contains 1.5 byte-code...so skip it here :-(
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   274
     # MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/jobjc/src
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   275
     # EXCLUDES+= tests/java/com/apple/jobjc
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   276
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   277
     EXCLUDES+= com/apple/jobjc
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   278
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   279
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   280
# The exception handling of swing beaninfo
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   281
# These resources violates the convention of having code and resources together under
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   282
# $(JDK_TOPDIR)/src/.../classes directories
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   283
$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo/images/%.gif
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15334
diff changeset
   284
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   285
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   286
# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   287
# JDK_FILTER at the make command line, only a subset of the JDK java files will
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   288
# be recompiled. If multiple paths are separated by comma, convert that into a
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   289
# space separated list.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   290
JDK_USER_DEFINED_FILTER:=$(strip $(subst $(COMMA),$(SPACE),$(JDK_FILTER)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   291
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   292
$(eval $(call SetupJavaCompilation,BUILD_JDK,\
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   293
                SETUP:=GENERATE_JDKBYTECODE,\
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   294
		SRC:=$(JDK_TOPDIR)/src/share/classes \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   295
		     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   296
		     $(MACOSX_SRC_DIRS) \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   297
		     $(JDK_OUTPUTDIR)/gensrc \
15134
3268973c300a 8005096: Move a few source files in swing/beaninfo and in a demo.
ohrstrom
parents: 15130
diff changeset
   298
		     $(JDK_OUTPUTDIR)/gensrc_no_srczip \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   299
		     $(CLOSED_SRC_DIRS),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   300
		INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   301
		EXCLUDES:=$(EXCLUDES),\
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   302
		EXCLUDE_FILES:=$(EXFILES),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   303
		BIN:=$(JDK_OUTPUTDIR)/classes,\
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   304
		COPY:=$(COPY_PATTERNS),\
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   305
		COPY_FILES:=$(COPY_FILES),\
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   306
		HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   307
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   308
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   309
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   310
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   311
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14345
diff changeset
   312
    $(eval $(call SetupJavaCompilation,BUILD_ALTCLASSES,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   313
		SETUP:=GENERATE_JDKBYTECODE,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   314
		SRC:=$(JDK_TOPDIR)/src/closed/share/altclasses, \
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14345
diff changeset
   315
		BIN:=$(JDK_OUTPUTDIR)/altclasses_classes))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   316
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14345
diff changeset
   317
    $(BUILD_ALTCLASSES): $(BUILD_JDK)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   318
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   319
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   320
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   321
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   322
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   323
$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin:
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   324
	$(MKDIR) -p $(@D)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   325
	$(TOUCH) $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   326
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   327
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   328
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   329
ifeq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   330
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   331
# JObjC.jar is compiled with BOOT_JAVAC which (may) not support the "-h" flag.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   332
#   so we first compile classes with BOOT_JAVAC and then with JDK_JAVAC :-(
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   333
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   334
$(eval $(call SetupJavaCompiler,GENERATE_15BYTECODE,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   335
     JAVAC:=$(JAVAC),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   336
     FLAGS:=-source 1.5 -target 1.5 -g -bootclasspath $(BOOT_RTJAR) -cp $(JDK_OUTPUTDIR)/../langtools/dist/lib/classes.jar $(DISABLE_WARNINGS),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   337
     SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   338
     SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   339
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14345
diff changeset
   340
$(eval $(call SetupJavaCompilation,BUILD_JOBJC,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   341
		SETUP:=GENERATE_15BYTECODE,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13586
diff changeset
   342
		DISABLE_SJAVAC:=true,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   343
		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   344
		     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   345
		     $(JDK_OUTPUTDIR)/gensrc, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   346
		INCLUDES := com/apple/jobjc,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   347
                EXCLUDES := tests/java/com/apple/jobjc,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   348
		BIN:=$(JDK_OUTPUTDIR)/jobjc_classes,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   349
		JAR:=$(JDK_OUTPUTDIR)/lib/JObjC.jar, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   350
		JARINDEX := true))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   351
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14345
diff changeset
   352
$(BUILD_JOBJC) : $(BUILD_JDK)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   353
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14345
diff changeset
   354
$(eval $(call SetupJavaCompilation,BUILD_JOBJC_HEADERS,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   355
		SETUP:=GENERATE_JDKBYTECODE,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   356
		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   357
		     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   358
		     $(JDK_OUTPUTDIR)/gensrc, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   359
		INCLUDES := com/apple/jobjc,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   360
                EXCLUDES := tests/java/com/apple/jobjc,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   361
		BIN:=$(JDK_OUTPUTDIR)/jobjc_classes_headers,\
14344
a5537423264b 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14231
diff changeset
   362
		HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers_jobjc))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   363
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14345
diff changeset
   364
$(BUILD_JOBJC_HEADERS) : $(BUILD_JDK)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   365
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   366
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   367
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   368
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12893
diff changeset
   369
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   370
ifndef OPENJDK
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   371
ifeq ($(OPENJDK_TARGET_OS), windows)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   372
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   373
    $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_32,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   374
		SETUP:=GENERATE_JDKBYTECODE,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   375
		JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   376
		SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/32bit,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   377
		BIN:=$(JDK_OUTPUTDIR)/classes_ab/32bit))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   378
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   379
    $(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   380
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   381
    $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_LEGACY,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   382
		SETUP:=GENERATE_JDKBYTECODE,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   383
		JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   384
		SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/legacy,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   385
		BIN:=$(JDK_OUTPUTDIR)/classes_ab/legacy))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   386
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   387
    $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   388
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   389
else
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   390
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   391
    $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_64,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   392
		SETUP:=GENERATE_JDKBYTECODE,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   393
		JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   394
		SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/64bit,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   395
		BIN:=$(JDK_OUTPUTDIR)/classes_ab/64bit))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   396
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   397
    $(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   398
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   399
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   400
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   401
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   402
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   403
##########################################################################################
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   404
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14345
diff changeset
   405
all: $(BUILD_JDK) $(BUILD_ALTCLASSES) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
15334
erikj
parents: 15324 15136
diff changeset
   406
	$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   407
	$(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14708
diff changeset
   408
	$(BUILD_ACCESSBRIDGE_LEGACY)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   409
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   410
.PHONY: all