jdk/make/CreateJars.gmk
author mikael
Tue, 18 Feb 2014 17:55:04 -0800 (2014-02-19)
changeset 23304 bb48872f9326
parent 22342 c83795c442b7
child 22963 a28e6f0b511b
permissions -rw-r--r--
8035287: gcc warnings compiling various libraries files Reviewed-by: prr
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     1
#
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
     2
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     4
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    10
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    15
# accompanied this code).
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    16
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    20
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    23
# questions.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    24
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    25
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    26
include $(SPEC)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    27
include MakeBase.gmk
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    28
include JavaCompilation.gmk
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    29
include Setup.gmk
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    30
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    31
default: all
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    32
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14790
diff changeset
    33
# Prepare the find cache. Only used if running on windows.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    34
$(eval $(call FillCacheFind, $(JDK_OUTPUTDIR)/classes))
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14790
diff changeset
    35
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    36
include Tools.gmk
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    37
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    38
include Profiles.gmk
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    39
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    40
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    41
# This makefile...so that altering will trigger rebuilding include/exclude-lists => jars
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    42
#
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21416
diff changeset
    43
MAKEFILE = $(JDK_TOPDIR)/make/CreateJars.gmk
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    44
#
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    45
# And similarly for the Profiles
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21416
diff changeset
    46
PROFILE_MAKEFILES = $(JDK_TOPDIR)/make/Profiles.gmk $(JDK_TOPDIR)/make/profile-rtjar-includes.txt
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    47
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21416
diff changeset
    48
MAINMANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21416
diff changeset
    49
BEANMANIFEST := $(JDK_TOPDIR)/make/data/swingbeaninfo/manifest.mf
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    50
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    51
$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/lib))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    52
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    53
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    54
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    55
$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    56
    SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    57
    SUFFIXES := .class .gif .png .properties, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    58
    INCLUDES := sun/tools/jconsole com/sun/tools/jconsole, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    59
    JARMAIN := sun.tools.jconsole.JConsole, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    60
    JAR := $(IMAGES_OUTPUTDIR)/lib/jconsole.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    61
    SKIP_METAINF := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    62
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    63
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    64
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    65
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    66
$(eval $(call SetupArchive,BUILD_DNS_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    67
    SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    68
    INCLUDES := sun/net/spi/nameservice/dns, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    69
    EXTRA_FILES := META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    70
    JAR := $(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    71
    SKIP_METAINF := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    72
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    73
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    74
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    75
14334
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    76
LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    77
    iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    78
    th tr uk vi zh
14334
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    79
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    80
LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/, $(LOCALEDATA_INCLUDE_LOCALES)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    81
    $(addprefix sun/util/resources/, $(LOCALEDATA_INCLUDE_LOCALES))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    82
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    83
$(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    84
    SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    85
    SUFFIXES := .class _dict _th, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    86
    INCLUDES := $(LOCALEDATA_INCLUDES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    87
    EXCLUDES := sun/text/resources/th/BreakIteratorRules_th.class, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    88
    JAR := $(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
    89
    SKIP_METAINF := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    90
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    91
##########################################################################################
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    92
#
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    93
# Different variants of rt.jar are built based on the current profile. The output
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    94
# directory is augmented with the profile name so that the final jar file and all the
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    95
# intermediary list files will be in directory. This has the form lib$PROFILE rather than
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    96
# lib/$PROFILE so that it won't get copied as part of the image generation process.
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    97
# Each profile customizes the RT_JAR_EXCLUDES variable.
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    98
#
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    99
##########################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   100
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   101
# Full JRE exclude list for rt.jar and resources.jar
18573
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   102
# This value should exclude types destined for jars other than rt.jar and resources.jar.
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   103
# When building a Profile this value augments the profile specific exclusions
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   104
RT_JAR_EXCLUDES += \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   105
    com/sun/codemodel \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   106
    com/sun/crypto/provider \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   107
    com/sun/istack/internal/tools \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   108
    com/sun/jarsigner \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   109
    com/sun/java/accessibility \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   110
    com/sun/javadoc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   111
    com/sun/jdi \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   112
    com/sun/net/ssl/internal/ssl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   113
    com/sun/source \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   114
    com/sun/tools \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   115
    com/sun/xml/internal/dtdparser \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   116
    com/sun/xml/internal/rngom \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   117
    com/sun/xml/internal/xsom \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   118
    javax/crypto \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   119
    javax/swing/AbstractButtonBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   120
    javax/swing/beaninfo \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   121
    javax/swing/BoxBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   122
    javax/swing/JAppletBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   123
    javax/swing/JButtonBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   124
    javax/swing/JCheckBoxBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   125
    javax/swing/JCheckBoxMenuItemBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   126
    javax/swing/JColorChooserBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   127
    javax/swing/JComboBoxBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   128
    javax/swing/JComponentBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   129
    javax/swing/JDesktopPaneBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   130
    javax/swing/JDialogBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   131
    javax/swing/JEditorPaneBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   132
    javax/swing/JFileChooserBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   133
    javax/swing/JFormattedTextFieldBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   134
    javax/swing/JFrameBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   135
    javax/swing/JInternalFrameBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   136
    javax/swing/JLabelBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   137
    javax/swing/JLayeredPaneBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   138
    javax/swing/JListBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   139
    javax/swing/JMenuBarBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   140
    javax/swing/JMenuBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   141
    javax/swing/JMenuItemBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   142
    javax/swing/JOptionPaneBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   143
    javax/swing/JPanelBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   144
    javax/swing/JPasswordFieldBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   145
    javax/swing/JPopupMenuBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   146
    javax/swing/JProgressBarBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   147
    javax/swing/JRadioButtonBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   148
    javax/swing/JRadioButtonMenuItemBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   149
    javax/swing/JScrollBarBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   150
    javax/swing/JScrollPaneBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   151
    javax/swing/JSeparatorBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   152
    javax/swing/JSliderBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   153
    javax/swing/JSpinnerBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   154
    javax/swing/JSplitPaneBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   155
    javax/swing/JTabbedPaneBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   156
    javax/swing/JTableBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   157
    javax/swing/JTextAreaBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   158
    javax/swing/JTextFieldBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   159
    javax/swing/JTextPaneBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   160
    javax/swing/JToggleButtonBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   161
    javax/swing/JToolBarBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   162
    javax/swing/JTreeBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   163
    javax/swing/JWindowBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   164
    javax/swing/SwingBeanInfoBase.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   165
    javax/swing/text/JTextComponentBeanInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   166
    META-INF/services/com.sun.jdi.connect.Connector \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   167
    META-INF/services/com.sun.jdi.connect.spi.TransportService \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   168
    META-INF/services/com.sun.tools.attach.spi.AttachProvider \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   169
    META-INF/services/com.sun.tools.xjc.Plugin \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   170
    META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   171
    org/relaxng/datatype \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   172
    sun/awt/HKSCS.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   173
    sun/awt/motif/X11GB2312.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   174
    sun/awt/motif/X11GB2312\$$$$Decoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   175
    sun/awt/motif/X11GB2312\$$$$Encoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   176
    sun/awt/motif/X11GBK.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   177
    sun/awt/motif/X11GBK\$$$$Encoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   178
    sun/awt/motif/X11KSC5601.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   179
    sun/awt/motif/X11KSC5601\$$$$Decoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   180
    sun/awt/motif/X11KSC5601\$$$$Encoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   181
    sun/jvmstat \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   182
    sun/net/spi/nameservice/dns \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   183
    sun/nio/cs/ext \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   184
    sun/rmi/rmic \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   185
    sun/security/ec \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   186
    sun/security/internal \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   187
    sun/security/mscapi \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   188
    sun/security/pkcs11 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   189
    sun/security/provider/Sun.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   190
    sun/security/rsa/SunRsaSign.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   191
    sun/security/ssl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   192
    sun/security/tools/jarsigner \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   193
    sun/swing/BeanInfoUtils.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   194
    sun/text/resources/cldr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   195
    sun/tools/asm \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   196
    sun/tools/attach \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   197
    sun/tools/java \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   198
    sun/tools/javac \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   199
    sun/tools/jcmd \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   200
    sun/tools/jconsole \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   201
    sun/tools/jinfo \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   202
    sun/tools/jmap \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   203
    sun/tools/jps \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   204
    sun/tools/jstack \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   205
    sun/tools/jstat \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   206
    sun/tools/jstatd \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   207
    sun/tools/native2ascii \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   208
    sun/tools/serialver \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   209
    sun/tools/tree \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   210
    sun/tools/util \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   211
    sun/util/cldr/CLDRLocaleDataMetaInfo.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   212
    sun/util/resources/cldr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   213
    $(LOCALEDATA_INCLUDES) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   214
    com/oracle/jrockit/jfr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   215
    oracle/jrockit/jfr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   216
    jdk/jfr
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   217
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   218
# Find all files in the classes dir to use as dependencies. This could be more fine granular.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   219
ALL_FILES_IN_CLASSES := $(call not-containing, _the., $(filter-out %javac_state, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   220
    $(call CacheFind, $(JDK_OUTPUTDIR)/classes)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   221
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   222
RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar_manifest
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   223
RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar_manifest
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   224
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   225
$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   226
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   227
	$(RM) $@ $@.tmp
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   228
	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   229
	    -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   230
	    $(MAINMANIFEST) >> $@.tmp
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   231
	$(ECHO) >> $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   232
	$(CAT) $(BEANMANIFEST) >> $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   233
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   234
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   235
$(RESOURCE_JAR_MANIFEST_FILE): $(MAINMANIFEST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   236
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   237
	$(RM) $@ $@.tmp
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   238
	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   239
	    -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   240
	    $(MAINMANIFEST) >> $@.tmp
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   241
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   242
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   243
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEFILES)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   244
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   245
	$(RM) $@ $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   246
	$(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   247
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   248
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21416
diff changeset
   249
$(IMAGES_OUTPUTDIR)/lib/classlist: $(JDK_TOPDIR)/make/data/classlist/classlist.$(OPENJDK_TARGET_OS) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   250
    $(MAKEFILE)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   251
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   252
	$(RM) $@ $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   253
	$(TOOL_ADDJSUM) $< $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   254
	$(MV) $@.tmp $@
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   255
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   256
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   257
    $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   258
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   259
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   260
	($(CD) $(JDK_OUTPUTDIR)/classes && \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   261
	$(TOOL_JARREORDER) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   262
	    -o $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude . )
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   263
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   264
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   265
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   266
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   267
	$(RM) $@ $@.tmp
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   268
	$(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   269
        ifneq ($(PROFILE), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   270
          # # Add back classes from excluded packages (fixing the $ substitution in the process)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   271
	  for type in $(subst \$$,\, $(RT_JAR_INCLUDE_TYPES)) ; do \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   272
	    $(ECHO) $$type >> $@.tmp ; \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   273
	  done
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   274
        endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   275
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   276
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   277
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   278
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   279
	$(RM) $@ $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   280
	$(GREP) -v -e '\.class$$' \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   281
	    -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   282
	    $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   283
        ifneq ($(PROFILE), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   284
          # # Strip out all META-INF/services/ entries
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   285
	  $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   286
          # # Add back the required services
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   287
          # # FIXME: On Solaris if PROFILE_INCLUDE_METAINF_SERVICES is not defined
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   288
          # # we get a syntax error from sh. That doesn't happen on linux
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   289
	  for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   290
	    $(ECHO) $$service >> $@.tmp2; \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   291
	  done
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   292
	  $(MV) $@.tmp2 $@.tmp
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   293
        endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   294
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   295
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   296
# This is a hack but I don't know how to make this fit into the existing scheme
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   297
$(PROFILE_VERSION_CLASS_TARGETS): $(PROFILE_VERSION_JAVA_TARGETS)
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   298
	@$(JAVAC) -d $(@D)/../../ $(@D)/$(VERSION_JAVA_FILE)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   299
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   300
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   301
RT_JAR_CREATE_OPTIONS := c0fm
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   302
RT_JAR_UPDATE_OPTIONS := u0f
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   303
ifeq ($(COMPRESS_JARS), true)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   304
  RT_JAR_CREATE_OPTIONS := cfm
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   305
  RT_JAR_UPDATE_OPTIONS := uf
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   306
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   307
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   308
# This defines a target-specific variables to make the shell logic easier to see.
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   309
# We need to find the Version.class file for the profile currently being built
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   310
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   311
    CLASS_FILE = $(if $(PROFILE), $(strip $(foreach class, $(PROFILE_VERSION_CLASS_TARGETS), $(if $(findstring $(PROFILE), $(class)), $(class)))), NO_SUCH_FILE)
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   312
# This is the real target
22046
b7163958d6d9 8029805: Remove LogManager addPropertyChangeListener and removePropertyChangeListener methods
alanb
parents: 21805
diff changeset
   313
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE) $(PROFILE_VERSION_CLASS_TARGETS)
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   314
	$(ECHO) Creating rt.jar $(PROFILE) Compressed=$(COMPRESS_JARS)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   315
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   316
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   317
	$(CD) $(JDK_OUTPUTDIR)/classes && \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   318
	$(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   319
	    @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents && \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   320
	if [ -f $(CLASS_FILE) ]; then \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   321
	  $(ECHO) Updating rt.jar $(PROFILE) && \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   322
	  $(CD) $(patsubst %$(VERSION_CLASS_PATH), %, $(CLASS_FILE)) && \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   323
	  $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(VERSION_CLASS_PATH); \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   324
	fi
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   325
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   326
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   327
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   328
    $(RESOURCE_JAR_MANIFEST_FILE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   329
	$(ECHO) Creating resources.jar
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   330
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   331
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   332
	$(CD) $(JDK_OUTPUTDIR)/classes && \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   333
	$(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   334
	    @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   335
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   336
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   337
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   338
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   339
ifneq ($(OPENJDK_TARGET_OS), windows)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   340
  CHARSETS_EXTRA_FILES := sun/awt/motif/X11GBK.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   341
      sun/awt/motif/X11GB2312\$$$$Decoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   342
      sun/awt/motif/X11GB2312.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   343
      sun/awt/motif/X11KSC5601\$$$$Decoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   344
      sun/awt/motif/X11KSC5601\$$$$Encoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   345
      sun/awt/motif/X11GB2312\$$$$Encoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   346
      sun/awt/motif/X11GBK\$$$$Encoder.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   347
      sun/awt/motif/X11KSC5601.class
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   348
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   349
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   350
$(eval $(call SetupArchive,BUILD_CHARSETS_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   351
    SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   352
    SUFFIXES := .class .dat, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   353
    INCLUDES := sun/nio/cs/ext, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   354
    EXTRA_FILES := sun/awt/HKSCS.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   355
        $(CHARSETS_EXTRA_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   356
    JAR := $(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   357
    SKIP_METAINF := true, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   358
    CHECK_COMPRESS_JAR := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   359
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   360
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   361
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   362
ifndef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   363
  ifeq ($(ENABLE_JFR), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   364
    $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   365
        SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   366
        SUFFIXES := .class .jfc .xsd, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   367
        INCLUDES := com/oracle/jrockit/jfr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   368
            oracle/jrockit/jfr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   369
            jdk/jfr, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   370
        JAR := $(IMAGES_OUTPUTDIR)/lib/jfr.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   371
        SKIP_METAINF := true, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   372
        MANIFEST := $(MAINMANIFEST), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   373
        CHECK_COMPRESS_JAR := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   374
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   375
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   376
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   377
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   378
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   379
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   380
$(eval $(call SetupArchive,BUILD_JSSE_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   381
    SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   382
    INCLUDES := sun/security/provider/Sun.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   383
        sun/security/rsa/SunRsaSign.class \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   384
        sun/security/ssl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   385
        com/sun/net/ssl/internal/ssl, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   386
    JAR := $(IMAGES_OUTPUTDIR)/lib/jsse.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   387
    SKIP_METAINF := true, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   388
    MANIFEST := $(MAINMANIFEST), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   389
    CHECK_COMPRESS_JAR := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   390
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   391
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   392
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   393
$(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   394
    SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   395
    SUFFIXES := BeanInfo.class .gif, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   396
    INCLUDES := javax/swing sun/swing, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   397
    EXCLUDES := javax/swing/plaf, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   398
    EXTRA_FILES := javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   399
    JAR := $(IMAGES_OUTPUTDIR)/lib/dt.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   400
    SKIP_METAINF := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   401
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   402
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   403
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   404
# Get the CLDRVERSION
20549
815df0732142 8001933: Move Gensrc*.gmk and Gendata*.gmk into separate directories.
ihse
parents: 20547
diff changeset
   405
include gensrc/GensrcCLDR.gmk
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   406
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   407
CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   408
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   409
$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   410
    SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   411
    SUFFIXES := .class, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   412
    INCLUDES := sun/text/resources/cldr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   413
        sun/util/cldr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   414
        sun/util/resources/cldr, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   415
    EXCLUDES := sun/util/cldr/CLDRLocaleProviderAdapter, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   416
    JAR := $(CLDRDATA_JAR_DST), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   417
    EXTRA_MANIFEST_ATTR := CLDR-Version: $(CLDRVERSION), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   418
    SKIP_METAINF := true))
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   419
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   420
##########################################################################################
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   421
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   422
TOOLS_JAR_INCLUDES := \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   423
    com/sun/codemodel \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   424
    com/sun/istack/internal/tools \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   425
    com/sun/jarsigner \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   426
    com/sun/javadoc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   427
    com/sun/jdi \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   428
    com/sun/source \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   429
    com/sun/tools/attach \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   430
    com/sun/tools/classfile \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   431
    com/sun/tools/corba \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   432
    com/sun/tools/doclets \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   433
    com/sun/tools/doclint \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   434
    com/sun/tools/example/debug/expr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   435
    com/sun/tools/example/debug/tty \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   436
    com/sun/tools/extcheck \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   437
    com/sun/tools/hat \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   438
    com/sun/tools/internal/jxc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   439
    com/sun/tools/internal/jxc/ap \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   440
    com/sun/tools/internal/ws \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   441
    com/sun/tools/internal/ws/wscompile/plugin/at_generated \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   442
    com/sun/tools/internal/xjc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   443
    com/sun/tools/javac \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   444
    com/sun/tools/javadoc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   445
    com/sun/tools/javah \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   446
    com/sun/tools/javap \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   447
    com/sun/tools/jdeps \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   448
    com/sun/tools/jdi \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   449
    com/sun/tools/script/shell \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   450
    com/sun/xml/internal/dtdparser \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   451
    com/sun/xml/internal/rngom \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   452
    com/sun/xml/internal/xsom \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   453
    org/relaxng/datatype \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   454
    sun/applet \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   455
    sun/jvmstat \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   456
    sun/rmi/rmic \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   457
    sun/security/tools/jarsigner \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   458
    sun/tools/asm \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   459
    sun/tools/attach \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   460
    sun/tools/jar \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   461
    sun/tools/java \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   462
    sun/tools/javac \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   463
    sun/tools/jcmd \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   464
    sun/tools/jinfo \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   465
    sun/tools/jmap \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   466
    sun/tools/jps \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   467
    sun/tools/jstack \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   468
    sun/tools/jstat \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   469
    sun/tools/jstatd \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   470
    sun/tools/native2ascii \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   471
    sun/tools/serialver \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   472
    sun/tools/tree \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   473
    sun/tools/util
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   474
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   475
# The sjavac tools is not ready for public consumption.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   476
TOOLS_JAR_EXCLUDES = com/sun/tools/sjavac
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   477
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   478
$(eval $(call SetupArchive,BUILD_TOOLS_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   479
    SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   480
    SUFFIXES := .class .prp .gif .properties .xml .css .xsd .js .html .txt .java \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   481
        Tool aliasmap options, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   482
    INCLUDES := $(TOOLS_JAR_INCLUDES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   483
    EXCLUDES := $(TOOLS_JAR_EXCLUDES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   484
    EXTRA_FILES := META-INF/services/com.sun.jdi.connect.Connector \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   485
        META-INF/services/com.sun.jdi.connect.spi.TransportService \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   486
        META-INF/services/com.sun.tools.attach.spi.AttachProvider \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   487
        META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   488
        META-INF/services/com.sun.tools.internal.xjc.Plugin, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   489
    JAR := $(IMAGES_OUTPUTDIR)/lib/tools.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   490
    SKIP_METAINF := true, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   491
    CHECK_COMPRESS_JAR := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   492
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   493
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   494
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   495
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21416
diff changeset
   496
include CORE_PKGS.gmk
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21416
diff changeset
   497
include NON_CORE_PKGS.gmk
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   498
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   499
# The compiler should not issue a "Proprietary" warning when compiling
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   500
# classes in the com.sun.java.swing.plaf packages, since we've always
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   501
# allowed, and even advocated, extending them (see bug 6476749).
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   502
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   503
# This approach is NOT to be used as a general purpose way to avoid such
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   504
# compiler warnings for non-core packages. The correct way is to document
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   505
# the packages in NON_CORE_PKGS.gmk, and include them in the NON_CORE_PKGS
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   506
# definition.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   507
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   508
# Swing has taken this approach only as a temporary measure to avoid
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   509
# the compiler warnings until we can properly document these packages.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   510
# This is covered under 6491853.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   511
EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   512
    com.sun.java.swing.plaf.motif \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   513
    com.sun.java.swing.plaf.gtk
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   514
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   515
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   516
# Include the exported private packages in ct.sym.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   517
# This is an interim solution until the ct.sym is replaced
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   518
# with a new module system (being discussed for JDK 8).
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   519
#
16507
75bde2ca0061 8007703: Remove com.sun.servicetag API
mchung
parents: 16487
diff changeset
   520
EXPORTED_PRIVATE_PKGS = com.oracle.net \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   521
    com.oracle.nio
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   522
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   523
$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   524
	$(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   525
	$(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
15402
ce612878e7aa 8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents: 15335
diff changeset
   526
	$(JAVA) $(NEW_JAVAC) \
14790
9d42784b1823 8004803: build-infra: Cannot use icedtea as boot for closed build.
erikj
parents: 14596
diff changeset
   527
	    -bootclasspath $(JDK_OUTPUTDIR)/classes \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   528
	    -XDprocess.packages -proc:only \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   529
	    -processor com.sun.tools.javac.sym.CreateSymbols \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   530
	    -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   531
	    -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   532
	    -Acom.sun.tools.javac.sym.Profiles=profile-rtjar-includes.txt \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   533
	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   534
	$(TOUCH) $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   535
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   536
$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/symbols))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   537
$(eval $(call SetupArchive,BUILD_CT_SYM, $(IMAGES_OUTPUTDIR)/symbols/_the.symbols, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   538
    SRCS := $(IMAGES_OUTPUTDIR)/symbols, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   539
    INCLUDES := META-INF/sym, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   540
    JAR := $(IMAGES_OUTPUTDIR)/lib/ct.sym, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   541
    CHECK_COMPRESS_JAR := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   542
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   543
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   544
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   545
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   546
SRC_ZIP_INCLUDES = \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   547
    com/sun/corba \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   548
    com/sun/image/codec/jpeg \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   549
    com/sun/imageio \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   550
    com/sun/java_cup \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   551
    com/sun/javadoc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   552
    com/sun/java/swing \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   553
    com/sun/jmx \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   554
    com/sun/naming \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   555
    com/sun/org/apache \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   556
    com/sun/security/auth \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   557
    com/sun/security/jgss \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   558
    com/sun/source \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   559
    java \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   560
    javax/accessibility \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   561
    javax/annotation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   562
    javax/imageio \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   563
    javax/lang \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   564
    javax/management \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   565
    javax/naming \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   566
    javax/print \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   567
    javax/rmi \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   568
    javax/script \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   569
    javax/security \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   570
    javax/sound \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   571
    javax/sql \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   572
    javax/swing \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   573
    javax/tools \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   574
    javax/xml \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   575
    org/ietf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   576
    org/omg \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   577
    org/w3c/dom \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   578
    org/xml/sax \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   579
    #
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   580
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   581
SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   582
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   583
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/impsrc
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   584
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gendocsrc_rmic
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   585
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   586
  SRC_ZIP_SRCS += $(JDK_TOPDIR)/src/closed/share/classes
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   587
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   588
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   589
# Need to copy launcher src files into desired directory structure
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   590
# before zipping the sources.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   591
LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   592
    $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/java_md*)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   593
LAUNCHER_ZIP_SRC := $(patsubst $(JDK_TOPDIR)/src/share/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   594
    $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   595
    $(LAUNCHER_SRC_FILES)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   596
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   597
$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/share/bin/%
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   598
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   599
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   600
$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   601
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   602
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   603
$(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   604
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   605
# This dir needs to exist before macro is evaluated to avoid warning from find.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   606
$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/src))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   607
$(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   608
    SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   609
    INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   610
    EXCLUDES := javax/swing/beaninfo, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   611
    SUFFIXES := .java .c .h, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   612
    ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   613
    EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   614
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   615
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   616
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   617
ifndef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   618
  ifeq ($(OPENJDK_TARGET_OS), windows)
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   619
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   620
    $(eval $(call SetupArchive,BUILD_JACCESS_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   621
        SRCS := $(JDK_OUTPUTDIR)/classes, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   622
        INCLUDES := com/sun/java/accessibility/util, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   623
        JAR := $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   624
        SKIP_METAINF := true))
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   625
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   626
    JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   627
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   628
    ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   629
      $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   630
          SRCS := $(JDK_OUTPUTDIR)/classes_ab/32bit, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   631
          INCLUDES := com/sun/java/accessibility, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   632
          JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   633
          SKIP_METAINF := true))
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   634
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   635
      $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_LEGACY_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   636
          SRCS := $(JDK_OUTPUTDIR)/classes_ab/legacy, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   637
          INCLUDES := com/sun/java/accessibility, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   638
          JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   639
          SKIP_METAINF := true))
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   640
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   641
      JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   642
          $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   643
    else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   644
      $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR, , \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   645
          SRCS := $(JDK_OUTPUTDIR)/classes_ab/64bit, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   646
          INCLUDES := com/sun/java/accessibility, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   647
          JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   648
          SKIP_METAINF := true))
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   649
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   650
      JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   651
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   652
  endif
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   653
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   654
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   655
##########################################################################################
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   656
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   657
#
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   658
# This is an empty jar (only contains manifest) and fits poorly into framework...
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   659
# create simple rule instead
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   660
#
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   661
$(IMAGES_OUTPUTDIR)/lib/management-agent.jar: $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   662
	$(JAR) cfm $@ $<
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   663
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   664
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   665
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   666
$(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar: $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   667
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   668
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   669
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   670
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   671
# This file is imported from hotspot in Import.gmk. Copying it into images/lib so that
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   672
# all jars can be found in one place when creating images in Images.gmk. It needs to be
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   673
# done here so that clean targets can be simple and accurate.
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   674
$(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   675
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   676
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   677
##########################################################################################
15131
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
   678
#
15132
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   679
# sec-bin.zip is used by builds where the corresponding sources are not available
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   680
#
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   681
$(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   682
    SRC := $(JDK_OUTPUTDIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   683
    INCLUDES := classes/javax/net \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   684
        classes/javax/security/cert \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   685
        classes/com/sun/net/ssl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   686
        classes/com/sun/security/cert \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   687
        classes/sun/net/www/protocol/https \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   688
        classes/sun/security/pkcs12 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   689
        classes/sun/security/ssl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   690
        classes/sun/security/krb5 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   691
        classes/sun/security/krb5/internal \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   692
        classes/sun/security/krb5/internal/ccache \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   693
        classes/sun/security/krb5/internal/crypto \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   694
        classes/sun/security/krb5/internal/ktab \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   695
        classes/sun/security/krb5/internal/rcache \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   696
        classes/sun/security/krb5/internal/util, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   697
    INCLUDE_FILES := classes/sun/security/jgss/spi/GSSContextSpi.class, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   698
    EXCLUDES := classes/sun/security/krb5/internal/tools, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   699
    ZIP := $(IMAGES_OUTPUTDIR)/sec-bin.zip))
15131
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
   700
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
   701
JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
   702
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
   703
##########################################################################################
15132
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   704
#
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   705
# Windows specific binary security packages.
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   706
#
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   707
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   708
  # sec-windows-bin.zip is used by builds where the corresponding sources are not available
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   709
  $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   710
      SRC := $(JDK_OUTPUTDIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   711
      INCLUDES := classes/sun/security/krb5/internal/tools, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   712
      ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip))
15132
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   713
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   714
  JARS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip
15132
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   715
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   716
  # JGSS files contain the native Kerberos library
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   717
  ifeq ($(OPENJDK_TARGET_CPU), x86_64)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   718
    JGSS_ZIP_NAME = jgss-windows-x64-bin.zip
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   719
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   720
    JGSS_ZIP_NAME = jgss-windows-i586-bin.zip
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   721
  endif
15132
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   722
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   723
  $(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   724
      SRC := $(JDK_OUTPUTDIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   725
      INCLUDE_FILES := bin/w2k_lsa_auth.dll \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   726
          bin/w2k_lsa_auth.map \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   727
          bin/w2k_lsa_auth.pdb, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   728
      ZIP := $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)))
15132
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   729
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20324
diff changeset
   730
  JARS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)
15132
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   731
endif
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   732
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
   733
##########################################################################################
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   734
21128
2a7460bba7a5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20884
diff changeset
   735
# This rule copies all jars from jdk/lib/... to images/lib/... to avoid having to track 
2a7460bba7a5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20884
diff changeset
   736
# which jars are where
2a7460bba7a5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20884
diff changeset
   737
$(IMAGES_OUTPUTDIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
2a7460bba7a5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20884
diff changeset
   738
	$(install-file)
2a7460bba7a5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20884
diff changeset
   739
2a7460bba7a5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20884
diff changeset
   740
##########################################################################################
2a7460bba7a5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20884
diff changeset
   741
16029
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
   742
# Import nashorn.jar from nashorn dist dir.
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
   743
$(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
   744
	$(install-file)
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
   745
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
   746
##########################################################################################
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
   747
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   748
-include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   749
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   750
##########################################################################################
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   751
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   752
all: $(JARS)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   753
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   754
.PHONY: default all