jdk/makefiles/CreateJars.gmk
author anoll
Thu, 10 Oct 2013 15:44:12 +0200
changeset 20707 b3b658c6d1f8
parent 20324 9ae20c600c08
child 20547 453837141fac
child 20543 298a19a1a1f6
child 20771 fd59589eab62
permissions -rw-r--r--
8023014: CodeSweeperSweepNoFlushTest.java fails with HS crash Summary: Ensure ensure correct initialization of compiler runtime Reviewed-by: kvn, twisti
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.
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14790
diff changeset
    34
$(eval $(call FillCacheFind,$(JDK_OUTPUTDIR)/classes))
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
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    43
MAKEFILE=$(JDK_TOPDIR)/makefiles/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
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    46
PROFILE_MAKEFILES=$(JDK_TOPDIR)/makefiles/Profiles.gmk $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    47
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    48
MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    49
BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    50
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    51
$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/lib))
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
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    55
$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    56
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    57
		SUFFIXES:=.class .gif .png .properties,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    58
		INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    59
		JARMAIN:=sun.tools.jconsole.JConsole,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    60
		JAR:=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    61
		SKIP_METAINF:=true))
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
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    66
$(eval $(call SetupArchive,BUILD_DNS_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    67
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    68
		INCLUDES:=sun/net/spi/nameservice/dns,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    69
		EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    70
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    71
		SKIP_METAINF:=true))
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 \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    77
                              iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    78
                              th tr uk vi zh
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    79
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
    80
LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/,$(LOCALEDATA_INCLUDE_LOCALES)) \
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
    81
		       $(addprefix sun/util/resources/,$(LOCALEDATA_INCLUDE_LOCALES))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    82
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    83
$(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    84
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    85
		SUFFIXES:=.class _dict _th,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    86
		INCLUDES:=$(LOCALEDATA_INCLUDES),\
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
    87
		EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    88
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    89
		SKIP_METAINF:=true))
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 += \
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   105
	com/oracle/security \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   106
	com/sun/codemodel \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   107
	com/sun/crypto/provider \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   108
	com/sun/istack/internal/tools \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   109
	com/sun/jarsigner \
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   110
	com/sun/java/accessibility \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   111
	com/sun/javadoc \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   112
	com/sun/jdi \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   113
	com/sun/net/ssl/internal/ssl \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   114
	com/sun/source \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   115
	com/sun/tools \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   116
	com/sun/xml/internal/dtdparser \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   117
	com/sun/xml/internal/rngom \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   118
	com/sun/xml/internal/xsom \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   119
	javax/crypto \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   120
	javax/swing/AbstractButtonBeanInfo.class \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   121
	javax/swing/beaninfo \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   122
	javax/swing/BoxBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   123
	javax/swing/JAppletBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   124
	javax/swing/JButtonBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   125
	javax/swing/JCheckBoxBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   126
	javax/swing/JCheckBoxMenuItemBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   127
	javax/swing/JColorChooserBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   128
	javax/swing/JComboBoxBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   129
	javax/swing/JComponentBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   130
	javax/swing/JDesktopPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   131
	javax/swing/JDialogBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   132
	javax/swing/JEditorPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   133
	javax/swing/JFileChooserBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   134
	javax/swing/JFormattedTextFieldBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   135
	javax/swing/JFrameBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   136
	javax/swing/JInternalFrameBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   137
	javax/swing/JLabelBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   138
	javax/swing/JLayeredPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   139
	javax/swing/JListBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   140
	javax/swing/JMenuBarBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   141
	javax/swing/JMenuBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   142
	javax/swing/JMenuItemBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   143
	javax/swing/JOptionPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   144
	javax/swing/JPanelBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   145
	javax/swing/JPasswordFieldBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   146
	javax/swing/JPopupMenuBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   147
	javax/swing/JProgressBarBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   148
	javax/swing/JRadioButtonBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   149
	javax/swing/JRadioButtonMenuItemBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   150
	javax/swing/JScrollBarBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   151
	javax/swing/JScrollPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   152
	javax/swing/JSeparatorBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   153
	javax/swing/JSliderBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   154
	javax/swing/JSpinnerBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   155
	javax/swing/JSplitPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   156
	javax/swing/JTabbedPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   157
	javax/swing/JTableBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   158
	javax/swing/JTextAreaBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   159
	javax/swing/JTextFieldBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   160
	javax/swing/JTextPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   161
	javax/swing/JToggleButtonBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   162
	javax/swing/JToolBarBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   163
	javax/swing/JTreeBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   164
	javax/swing/JWindowBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   165
	javax/swing/SwingBeanInfoBase.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   166
	javax/swing/text/JTextComponentBeanInfo.class \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   167
	META-INF/services/com.sun.jdi.connect.Connector \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   168
	META-INF/services/com.sun.jdi.connect.spi.TransportService \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   169
	META-INF/services/com.sun.tools.attach.spi.AttachProvider \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   170
	META-INF/services/com.sun.tools.xjc.Plugin \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   171
	META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   172
	org/relaxng/datatype \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   173
	sun/awt/HKSCS.class \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   174
	sun/awt/motif/X11GB2312.class \
16478
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   175
	sun/awt/motif/X11GB2312\$$$$Decoder.class \
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   176
	sun/awt/motif/X11GB2312\$$$$Encoder.class \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   177
	sun/awt/motif/X11GBK.class \
16478
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   178
	sun/awt/motif/X11GBK\$$$$Encoder.class \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   179
	sun/awt/motif/X11KSC5601.class \
16478
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   180
	sun/awt/motif/X11KSC5601\$$$$Decoder.class \
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   181
	sun/awt/motif/X11KSC5601\$$$$Encoder.class \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   182
	sun/jvmstat \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   183
	sun/net/spi/nameservice/dns \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   184
	sun/nio/cs/ext \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   185
	sun/rmi/rmic \
17491
7a33824ec8c5 7194075: Various classes of sunec.jar are duplicated in rt.jar
vinnie
parents: 16852
diff changeset
   186
	sun/security/ec \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   187
	sun/security/internal \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   188
	sun/security/mscapi \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   189
	sun/security/pkcs11 \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   190
	sun/security/provider/Sun.class \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   191
	sun/security/rsa/SunRsaSign.class \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   192
	sun/security/ssl \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   193
	sun/security/tools/jarsigner \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   194
	sun/swing/BeanInfoUtils.class \
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   195
	sun/text/resources/cldr \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   196
	sun/tools/asm \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   197
	sun/tools/attach \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   198
	sun/tools/java \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   199
	sun/tools/javac \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   200
	sun/tools/jcmd \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   201
	sun/tools/jconsole \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   202
	sun/tools/jinfo \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   203
	sun/tools/jmap \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   204
	sun/tools/jps \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   205
	sun/tools/jstack \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   206
	sun/tools/jstat \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   207
	sun/tools/jstatd \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   208
	sun/tools/native2ascii \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   209
	sun/tools/serialver \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   210
	sun/tools/tree \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   211
	sun/tools/util \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   212
	sun/util/cldr/CLDRLocaleDataMetaInfo.class \
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   213
	sun/util/resources/cldr \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   214
	$(LOCALEDATA_INCLUDES) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   215
	com/oracle/jrockit/jfr \
18573
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   216
	oracle/jrockit/jfr \
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   217
	jdk/jfr
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   218
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   219
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   220
        RT_JAR_EXCLUDES += com/sun/nio/sctp \
14425
0005b8b4ec0b 8003161: small fixes to re-enable new build system
ohrstrom
parents: 14345
diff changeset
   221
                           sun/nio/ch/sctp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   222
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   223
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   224
# Find all files in the classes dir to use as dependencies. This could be more fine granular.
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14790
diff changeset
   225
ALL_FILES_IN_CLASSES := $(call not-containing,_the.,$(filter-out %javac_state,\
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14790
diff changeset
   226
                        $(call CacheFind,$(JDK_OUTPUTDIR)/classes)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   227
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   228
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
   229
RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar_manifest
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   230
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   231
$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   232
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   233
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   234
	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" 		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   235
	       -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   236
	       $(MAINMANIFEST) >> $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   237
	$(ECHO) >> $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   238
	$(CAT) $(BEANMANIFEST) >> $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   239
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   240
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   241
$(RESOURCE_JAR_MANIFEST_FILE): $(MAINMANIFEST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   242
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   243
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   244
	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" 		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   245
	       -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   246
	       $(MAINMANIFEST) >> $@.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
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   249
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEFILES)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   250
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   251
	$(RM) $@ $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   252
	$(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   253
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   254
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   255
$(IMAGES_OUTPUTDIR)/lib/classlist : $(JDK_TOPDIR)/make/tools/sharing/classlist.$(OPENJDK_TARGET_OS) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   256
  $(MAKEFILE)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   257
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   258
	$(RM) $@ $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   259
	$(TOOL_ADDJSUM) $< $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   260
	$(MV) $@.tmp $@
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   261
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   262
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   263
					 $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   264
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   265
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   266
	($(CD) $(JDK_OUTPUTDIR)/classes && \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   267
	    $(TOOL_JARREORDER) \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   268
		-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
   269
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   270
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   271
$(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
   272
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   273
	$(RM) $@ $@.tmp
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   274
	$(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   275
ifneq ($(PROFILE),)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   276
#       # Add back classes from excluded packages (fixing the $ substitution in the process)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   277
	for type in  $(subst \$$,\, $(RT_JAR_INCLUDE_TYPES)) ; do \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   278
	  $(ECHO) $$type >> $@.tmp ; \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   279
	done
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   280
endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   281
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   282
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   283
$(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
   284
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   285
	$(RM) $@ $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   286
	$(GREP) -v -e '\.class$$' \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   287
	    -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   288
	    $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   289
ifneq ($(PROFILE),)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   290
#       # Strip out all META-INF/services/ entries
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   291
	$(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   292
#       # Add back the required services
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   293
#       # FIXME: On Solaris if PROFILE_INCLUDE_METAINF_SERVICES is not defined
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   294
#       # we get a syntax error from sh. That doesn't happen on linux
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   295
	for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   296
	  $(ECHO) $$service >> $@.tmp2; \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   297
	done
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   298
	$(MV) $@.tmp2 $@.tmp
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   299
endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   300
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   301
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   302
# This is a hack but I don't know how to make this fit into the existing scheme
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   303
$(PROFILE_VERSION_CLASS_TARGETS) : $(PROFILE_VERSION_JAVA_TARGETS)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   304
	@$(JAVAC) -d $(@D)/../../ $(@D)/$(VERSION_JAVA_FILE)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   305
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   306
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   307
# Support for removing the addPropertyChangeListener and removePropertyChangeListener
18573
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   308
# methods from classes that only go into the profile builds.
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   309
BEANLESS_CLASSES = $(IMAGES_OUTPUTDIR)/beanless
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   310
16478
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   311
# When there are $ characters in filenames we have some very subtle interactions between
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   312
# make expansion and shell expansion. In this particular case $< will contain a single $ while
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   313
# $@ will contain \$. So we have to pass $< in single-quotes to avoid shell expansion
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   314
$(BEANLESS_CLASSES)/%: $(JDK_OUTPUTDIR)/classes/%
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   315
	$(MKDIR) -p $(@D)
16478
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   316
	$(TOOL_REMOVEMETHODS) '$<' $@ addPropertyChangeListener removePropertyChangeListener
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   317
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   318
CLASSES_TO_DEBEAN = \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   319
    java/util/logging/LogManager.class \
16478
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   320
    java/util/jar/Pack200\$$Packer.class \
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   321
    java/util/jar/Pack200\$$Unpacker.class \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   322
    com/sun/java/util/jar/pack/PackerImpl.class \
18573
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   323
    com/sun/java/util/jar/pack/UnpackerImpl.class
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   324
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   325
ifneq ($(PROFILE),)
16478
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   326
    BEANLESS_CLASSES_TARGETS := $(addprefix $(BEANLESS_CLASSES)/, $(CLASSES_TO_DEBEAN))
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   327
endif
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   328
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   329
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   330
RT_JAR_CREATE_OPTIONS := c0fm
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   331
RT_JAR_UPDATE_OPTIONS := u0f
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   332
ifeq ($(COMPRESS_JARS), true)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   333
    RT_JAR_CREATE_OPTIONS := cfm
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   334
    RT_JAR_UPDATE_OPTIONS := uf
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   335
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   336
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   337
# 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
   338
# 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
   339
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   340
  CLASS_FILE = $(if $(PROFILE),$(strip $(foreach class,$(PROFILE_VERSION_CLASS_TARGETS),$(if $(findstring $(PROFILE),$(class)),$(class)))), NO_SUCH_FILE)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   341
# This is the real target
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   342
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE) $(PROFILE_VERSION_CLASS_TARGETS) $(BEANLESS_CLASSES_TARGETS)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   343
	$(ECHO) Creating rt.jar $(PROFILE) Compressed=$(COMPRESS_JARS)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   344
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   345
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   346
	$(CD) $(JDK_OUTPUTDIR)/classes && \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   347
	    $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   348
	        @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents && \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   349
	    if [ -f $(CLASS_FILE) ]; then \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   350
	      $(ECHO)  Updating rt.jar $(PROFILE) && \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   351
	      $(CD) $(patsubst %$(VERSION_CLASS_PATH),%,$(CLASS_FILE)) && \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   352
                $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(VERSION_CLASS_PATH); \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   353
	      $(CD) $(BEANLESS_CLASSES) && \
16478
52ea0de470fd 8009429: Miscellaneous profiles cleanup
dholmes
parents: 16035
diff changeset
   354
		$(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(CLASSES_TO_DEBEAN); \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   355
            fi
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   356
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   357
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   358
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   359
				    $(RESOURCE_JAR_MANIFEST_FILE)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   360
	$(ECHO) Creating resources.jar
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   361
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   362
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   363
	$(CD) $(JDK_OUTPUTDIR)/classes && \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   364
	    $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   365
	        @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   366
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   367
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   368
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   369
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   370
ifneq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   371
    CHARSETS_EXTRA_FILES:=sun/awt/motif/X11GBK.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   372
                          sun/awt/motif/X11GB2312\$$$$Decoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   373
                          sun/awt/motif/X11GB2312.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   374
                          sun/awt/motif/X11KSC5601\$$$$Decoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   375
                          sun/awt/motif/X11KSC5601\$$$$Encoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   376
                          sun/awt/motif/X11GB2312\$$$$Encoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   377
                          sun/awt/motif/X11GBK\$$$$Encoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   378
                          sun/awt/motif/X11KSC5601.class
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   379
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   380
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   381
$(eval $(call SetupArchive,BUILD_CHARSETS_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   382
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   383
		SUFFIXES:=.class .dat,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   384
		INCLUDES:=sun/nio/cs/ext,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   385
		EXTRA_FILES := sun/awt/HKSCS.class \
17470
b65cf2b5983b 8012326: Deadlock occurs when Charset.availableCharsets() is called by several threads at the same time
sherman
parents: 16852
diff changeset
   386
			       $(CHARSETS_EXTRA_FILES), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   387
		JAR:=$(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   388
		SKIP_METAINF := true, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
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
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   393
ifndef OPENJDK
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   394
ifeq ($(ENABLE_JFR), true)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   395
    $(eval $(call SetupArchive,BUILD_JFR_JAR,,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   396
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
18030
2d12a524f3cc 8005008: Add Java Flight Recorder Phase II
sla
parents: 17493
diff changeset
   397
		SUFFIXES:=.class .jfc .xsd,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   398
		INCLUDES:=com/oracle/jrockit/jfr \
18573
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   399
			  oracle/jrockit/jfr \
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   400
			  jdk/jfr,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   401
		JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   402
		SKIP_METAINF:=true,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   403
		MANIFEST:=$(MAINMANIFEST), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   404
                CHECK_COMPRESS_JAR:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   405
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   406
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   407
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   408
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   409
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   410
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   411
$(eval $(call SetupArchive,BUILD_JSSE_JAR,,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   412
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   413
		INCLUDES:=sun/security/provider/Sun.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   414
			  sun/security/rsa/SunRsaSign.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   415
			  sun/security/ssl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   416
			  com/sun/net/ssl/internal/ssl,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   417
		JAR:=$(IMAGES_OUTPUTDIR)/lib/jsse.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   418
		SKIP_METAINF:=true,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   419
		MANIFEST:=$(MAINMANIFEST), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   420
                CHECK_COMPRESS_JAR:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   421
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   422
##########################################################################################
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   423
# Create manifest for security jars
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   424
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   425
#
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   426
# Include these extra attributes for now, should probably take out.
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   427
#
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   428
JCE_MANIFEST := $(IMAGES_OUTPUTDIR)/lib/_the.security.manifest.mf
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   429
$(JCE_MANIFEST): $(MAINMANIFEST)
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   430
	$(MKDIR) -p $(@D)
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   431
	$(RM) $@ $@.tmp
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   432
	$(SED) -e "s#@@RELEASE@@#$(JDK_VERSION)#"       \
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   433
               -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   434
               $(MAINMANIFEST) >> $@.tmp
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   435
	$(ECHO) "Extension-Name: javax.crypto" >> $@.tmp
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   436
	$(ECHO) "Implementation-Vendor-Id: com.sun" >> $@.tmp
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   437
	$(MV) $@.tmp $@
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   438
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   439
##########################################################################################
18573
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   440
# For security and crypto jars, always build the jar, but for closed, install the prebuilt
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   441
# signed version instead of the newly built jar. Unsigned jars are treated as intermediate
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   442
# targets and explicitly added to the JARS list. For open, signing is not needed. See
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   443
# SignJars.gmk for more information.
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   444
#
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   445
# The source for the crypto jars is not available for all licensees. The BUILD_CRYPTO
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   446
# variable is set to no if these jars can't be built to skip that step of the build.
18573
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   447
# Note that for OPENJDK, the build will fail if BUILD_CRYPTO=no since then there is no
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   448
# other way to get the jars than to build them.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   449
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   450
SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   451
SUNPKCS11_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunpkcs11.jar
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   452
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   453
$(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   454
	SRCS:=$(JDK_OUTPUTDIR)/classes, \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   455
	SUFFIXES:=.class,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   456
	INCLUDES:=sun/security/pkcs11,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   457
	JAR:=$(SUNPKCS11_JAR_UNSIGNED), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   458
        MANIFEST:=$(JCE_MANIFEST), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   459
	SKIP_METAINF := true))
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   460
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   461
$(SUNPKCS11_JAR_UNSIGNED): $(JCE_MANIFEST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   462
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   463
ifndef OPENJDK
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   464
    SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   465
    $(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   466
	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunPKCS11 provider..."
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   467
	$(install-file)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   468
else
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   469
    $(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_UNSIGNED)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   470
	$(install-file)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   471
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   472
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   473
JARS += $(SUNPKCS11_JAR_UNSIGNED)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   474
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   475
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   476
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   477
SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   478
SUNEC_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunec.jar
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   479
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   480
$(eval $(call SetupArchive,BUILD_SUNEC_JAR,,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   481
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   482
		SUFFIXES:=.class,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   483
		INCLUDES:=sun/security/ec,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   484
		JAR:=$(SUNEC_JAR_UNSIGNED), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   485
                MANIFEST:=$(JCE_MANIFEST), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   486
		SKIP_METAINF := true))
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   487
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   488
$(SUNEC_JAR_UNSIGNED): $(JCE_MANIFEST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   489
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   490
ifndef OPENJDK
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   491
    SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   492
    $(SUNEC_JAR_DST) : $(SUNEC_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   493
	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunEC provider..."
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   494
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   495
else
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   496
    $(SUNEC_JAR_DST) : $(SUNEC_JAR_UNSIGNED)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   497
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   498
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   499
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   500
JARS += $(SUNEC_JAR_UNSIGNED)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   501
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   502
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   503
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   504
$(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   505
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   506
		SUFFIXES:=BeanInfo.class .gif,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   507
		INCLUDES:=javax/swing sun/swing,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   508
		EXCLUDES:=javax/swing/plaf,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   509
		EXTRA_FILES:=javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   510
		JAR:=$(IMAGES_OUTPUTDIR)/lib/dt.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   511
		SKIP_METAINF:=true))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   512
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   513
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   514
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   515
SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   516
SUNJCE_PROVIDER_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunjce_provider.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   517
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   518
ifneq ($(BUILD_CRYPTO),no)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   519
  $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   520
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   521
		SUFFIXES:=.class,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   522
		INCLUDES:= com/sun/crypto/provider,\
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   523
		JAR:=$(SUNJCE_PROVIDER_JAR_UNSIGNED), \
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   524
                MANIFEST:=$(JCE_MANIFEST), \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   525
		SKIP_METAINF := true))
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   526
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   527
  $(SUNJCE_PROVIDER_JAR_UNSIGNED): $(JCE_MANIFEST)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   528
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   529
  JARS += $(SUNJCE_PROVIDER_JAR_UNSIGNED)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   530
endif
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   531
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   532
ifndef OPENJDK
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   533
    SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   534
    $(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_SRC)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   535
	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunJCE provider..."
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   536
	$(install-file)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   537
else
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   538
    $(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_UNSIGNED)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   539
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   540
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   541
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   542
##########################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   543
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   544
JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   545
JCE_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/jce.jar
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   546
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   547
ifneq ($(BUILD_CRYPTO),no)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   548
  $(eval $(call SetupArchive,BUILD_JCE_JAR,,\
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   549
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   550
		SUFFIXES:=.class,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   551
		INCLUDES:= javax/crypto sun/security/internal,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   552
		JAR:=$(JCE_JAR_UNSIGNED), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   553
                MANIFEST:=$(JCE_MANIFEST), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   554
		SKIP_METAINF := true))
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   555
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   556
  $(JCE_JAR_UNSIGNED): $(JCE_MANIFEST)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   557
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   558
  JARS +=  $(JCE_JAR_UNSIGNED)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   559
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   560
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   561
ifndef OPENJDK
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   562
  JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   563
  $(JCE_JAR_DST) : $(JCE_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   564
	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt jce.jar..."
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   565
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   566
else
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   567
  $(JCE_JAR_DST) : $(JCE_JAR_UNSIGNED)
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   568
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   569
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   570
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   571
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   572
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   573
US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   574
US_EXPORT_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/US_export_policy.jar
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   575
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   576
ifneq ($(BUILD_CRYPTO),no)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   577
  #
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   578
  # TODO fix so that SetupArchive does not write files into SRCS
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   579
  #   then we don't need this extra copying
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   580
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   581
  # NOTE:  We currently do not place restrictions on our limited export
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   582
  # policy.  This was not a typo.
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   583
  #
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   584
  US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   585
  US_EXPORT_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/US_export_policy_jar.tmp
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   586
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   587
  $(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   588
	$(install-file)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   589
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   590
  US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   591
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   592
  $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR,$(US_EXPORT_POLICY_JAR_DEPS),\
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   593
		SRCS:=$(US_EXPORT_POLICY_JAR_TMP), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   594
		SUFFIXES:= .policy,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   595
		JAR:=$(US_EXPORT_POLICY_JAR_UNSIGNED), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   596
		EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   597
		SKIP_METAINF := true))
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   598
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   599
  JARS += $(US_EXPORT_POLICY_JAR_UNSIGNED)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   600
endif
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   601
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   602
ifndef OPENJDK
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   603
  $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   604
	$(ECHO) $(LOG_INFO) Copying $(@F)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   605
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   606
else
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   607
  $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNSIGNED)
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   608
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   609
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   610
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   611
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   612
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   613
LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   614
LOCAL_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/local_policy.jar
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   615
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   616
ifneq ($(BUILD_CRYPTO),no)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   617
  #
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   618
  # TODO fix so that SetupArchive does not write files into SRCS
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   619
  #   then we don't need this extra copying
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   620
  #
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   621
  LOCAL_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/local_policy_jar.tmp
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   622
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   623
  ifeq ($(UNLIMITED_CRYPTO), true)
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   624
    LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   625
    LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   626
    LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   627
  else
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   628
    LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   629
    LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   630
                             $(LOCAL_POLICY_JAR_TMP)/default_local.policy
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   631
    LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   632
  endif
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   633
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   634
  $(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/%
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   635
	$(install-file)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   636
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   637
  $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR,$(LOCAL_POLICY_JAR_DEPS),\
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   638
		SRCS:=$(LOCAL_POLICY_JAR_TMP),\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   639
		SUFFIXES:= .policy,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   640
		JAR:=$(LOCAL_POLICY_JAR_UNSIGNED), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   641
		EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   642
		SKIP_METAINF := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   643
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   644
  JARS += $(LOCAL_POLICY_JAR_UNSIGNED)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   645
endif
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   646
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   647
ifndef OPENJDK
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   648
  $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   649
	$(ECHO) $(LOG_INFO) Copying $(@F)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   650
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   651
else
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17493
diff changeset
   652
  $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNSIGNED)
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   653
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   654
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   655
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   656
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   657
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   658
ifeq ($(OPENJDK_TARGET_OS),windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   659
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   660
SUNMSCAPI_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   661
SUNMSCAPI_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunmscapi.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   662
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   663
$(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   664
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   665
		SUFFIXES:=.class,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   666
		INCLUDES:= sun/security/mscapi,\
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   667
		JAR:=$(SUNMSCAPI_JAR_UNSIGNED), \
15137
1ad653469ebc 8006296: build-infra: Unsigned sunmscapi.jar is missing manifest.
erikj
parents: 15133
diff changeset
   668
		MANIFEST:=$(JCE_MANIFEST), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   669
		SKIP_METAINF:=true))
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   670
15137
1ad653469ebc 8006296: build-infra: Unsigned sunmscapi.jar is missing manifest.
erikj
parents: 15133
diff changeset
   671
$(SUNMSCAPI_JAR_UNSIGNED): $(JCE_MANIFEST)
1ad653469ebc 8006296: build-infra: Unsigned sunmscapi.jar is missing manifest.
erikj
parents: 15133
diff changeset
   672
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   673
ifndef OPENJDK
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   674
    SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   675
    $(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_SRC)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   676
	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunMSCAPI provider..."
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   677
	$(install-file)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   678
else
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   679
    $(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_UNSIGNED)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   680
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   681
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   682
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   683
JARS += $(SUNMSCAPI_JAR_UNSIGNED)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   684
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   685
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   686
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   687
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   688
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   689
ifeq ($(OPENJDK_TARGET_OS),solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   690
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   691
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   692
UCRYPTO_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   693
UCRYPTO_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/ucrypto.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   694
UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   695
15128
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   696
$(eval $(call SetupArchive,BUILD_UCRYPTO_JAR,,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   697
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   698
		SUFFIXES:=.class,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   699
		INCLUDES:=com/oracle/security/ucrypto,\
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   700
		JAR:=$(UCRYPTO_JAR_UNSIGNED), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   701
		MANIFEST:=$(JCE_MANIFEST), \
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   702
		SKIP_METAINF:=true))
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   703
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   704
$(UCRYPTO_JAR_UNSIGNED): $(JCE_MANIFEST)
296bb1620e00 8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents: 15126
diff changeset
   705
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   706
$(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   707
	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..."
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   708
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   709
18573
52f07c119829 8019155: Update makefiles with correct jfr packages
sla
parents: 18031
diff changeset
   710
JARS += $(UCRYPTO_JAR_UNSIGNED)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   711
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   712
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   713
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   714
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   715
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   716
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   717
# Get the CLDRVERSION
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   718
include GensrcCLDR.gmk
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   719
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   720
CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   721
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   722
$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR,,\
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   723
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   724
		SUFFIXES:=.class,\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   725
		INCLUDES:=sun/text/resources/cldr \
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   726
			  sun/util/cldr \
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   727
			  sun/util/resources/cldr,\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   728
		EXCLUDES:=sun/util/cldr/CLDRLocaleProviderAdapter,\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   729
		JAR:=$(CLDRDATA_JAR_DST),\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   730
		EXTRA_MANIFEST_ATTR:=CLDR-Version: $(CLDRVERSION),\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   731
		SKIP_METAINF:=true))
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   732
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   733
##########################################################################################
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   734
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   735
TOOLS_JAR_INCLUDES := \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   736
        com/sun/codemodel       \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   737
	com/sun/istack/internal/tools       \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   738
	com/sun/jarsigner	\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   739
	com/sun/javadoc		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   740
	com/sun/jdi		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   741
	com/sun/source          \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   742
	com/sun/tools/attach	\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   743
	com/sun/tools/classfile \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   744
	com/sun/tools/corba     \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   745
	com/sun/tools/doclets   \
14902
c03055cef158 8004832: Add new doclint package
jjg
parents: 14596
diff changeset
   746
	com/sun/tools/doclint   \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   747
	com/sun/tools/example/debug/expr \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   748
	com/sun/tools/example/debug/tty  \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   749
	com/sun/tools/extcheck  \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   750
	com/sun/tools/hat       \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   751
        com/sun/tools/internal/jxc             \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   752
	com/sun/tools/internal/jxc/ap   \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   753
	com/sun/tools/internal/ws       \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   754
	com/sun/tools/internal/ws/wscompile/plugin/at_generated \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   755
	com/sun/tools/internal/xjc       \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   756
	com/sun/tools/javac     \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   757
	com/sun/tools/javadoc   \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   758
	com/sun/tools/javah     \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   759
	com/sun/tools/javap     \
14994
a544909d1d1c 8003562: Provide a CLI tool to analyze class dependencies
mchung
parents: 14902
diff changeset
   760
	com/sun/tools/jdeps	\
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   761
	com/sun/tools/jdi	\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   762
	com/sun/tools/script/shell	\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   763
	com/sun/xml/internal/dtdparser \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   764
        com/sun/xml/internal/rngom       \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   765
        com/sun/xml/internal/xsom       \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   766
        org/relaxng/datatype   \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   767
	sun/applet		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   768
	sun/jvmstat		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   769
	sun/rmi/rmic		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   770
	sun/security/tools/jarsigner \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   771
	sun/tools/asm		\
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   772
	sun/tools/attach	\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   773
	sun/tools/jar		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   774
	sun/tools/java		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   775
	sun/tools/javac		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   776
	sun/tools/jcmd		\
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   777
	sun/tools/jinfo         \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   778
	sun/tools/jmap		\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   779
	sun/tools/jps		\
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   780
	sun/tools/jstack        \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   781
	sun/tools/jstat		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   782
	sun/tools/jstatd	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   783
	sun/tools/native2ascii	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   784
	sun/tools/serialver	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   785
	sun/tools/tree		\
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   786
	sun/tools/util
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   787
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   788
# The sjavac tools is not ready for public consumption.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   789
TOOLS_JAR_EXCLUDES=com/sun/tools/sjavac
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   790
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   791
$(eval $(call SetupArchive,BUILD_TOOLS_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   792
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   793
		SUFFIXES:=.class .prp .gif .properties .xml .css .xsd .js .html .txt .java \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   794
			  Tool aliasmap options,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   795
		INCLUDES:=$(TOOLS_JAR_INCLUDES),\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   796
		EXCLUDES:=$(TOOLS_JAR_EXCLUDES),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   797
		EXTRA_FILES:=META-INF/services/com.sun.jdi.connect.Connector \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   798
			     META-INF/services/com.sun.jdi.connect.spi.TransportService \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   799
			     META-INF/services/com.sun.tools.attach.spi.AttachProvider \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   800
			     META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   801
			     META-INF/services/com.sun.tools.internal.xjc.Plugin,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   802
		JAR:=$(IMAGES_OUTPUTDIR)/lib/tools.jar,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   803
		SKIP_METAINF:=true, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   804
                CHECK_COMPRESS_JAR:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   805
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   806
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   807
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   808
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   809
include javadoc/CORE_PKGS.gmk
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   810
include javadoc/NON_CORE_PKGS.gmk
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   811
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   812
# The compiler should not issue a "Proprietary" warning when compiling
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   813
# classes in the com.sun.java.swing.plaf packages, since we've always
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   814
# allowed, and even advocated, extending them (see bug 6476749).
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   815
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   816
# 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
   817
# compiler warnings for non-core packages. The correct way is to document
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   818
# 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
   819
# definition.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   820
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   821
# Swing has taken this approach only as a temporary measure to avoid
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   822
# the compiler warnings until we can properly document these packages.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   823
# This is covered under 6491853.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   824
EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows  \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   825
                        com.sun.java.swing.plaf.motif    \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   826
                        com.sun.java.swing.plaf.gtk
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   827
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   828
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   829
# Include the exported private packages in ct.sym.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   830
# This is an interim solution until the ct.sym is replaced
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   831
# with a new module system (being discussed for JDK 8).
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   832
#
16507
75bde2ca0061 8007703: Remove com.sun.servicetag API
mchung
parents: 16487
diff changeset
   833
EXPORTED_PRIVATE_PKGS = com.oracle.net \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   834
                        com.oracle.nio
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   835
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   836
$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   837
	$(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   838
	$(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
   839
	$(JAVA) $(NEW_JAVAC) \
14790
9d42784b1823 8004803: build-infra: Cannot use icedtea as boot for closed build.
erikj
parents: 14596
diff changeset
   840
	    -bootclasspath $(JDK_OUTPUTDIR)/classes \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   841
	    -XDprocess.packages -proc:only \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   842
	    -processor com.sun.tools.javac.sym.CreateSymbols \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   843
	    -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   844
	    -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
   845
	    -Acom.sun.tools.javac.sym.Profiles=profile-rtjar-includes.txt \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   846
	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   847
	$(TOUCH) $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   848
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14790
diff changeset
   849
$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/symbols))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   850
$(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   851
		SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   852
		INCLUDES:=META-INF/sym,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   853
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   854
		CHECK_COMPRESS_JAR:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   855
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   856
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   857
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   858
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   859
SRC_ZIP_INCLUDES = \
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   860
	com/sun/corba			\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   861
	com/sun/image/codec/jpeg	\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   862
	com/sun/imageio                 \
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   863
	com/sun/java_cup		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   864
	com/sun/javadoc			\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   865
	com/sun/java/swing		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   866
	com/sun/jmx			\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   867
	com/sun/naming			\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   868
	com/sun/org/apache		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   869
	com/sun/security/auth		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   870
	com/sun/security/jgss		\
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   871
	com/sun/source			\
20324
9ae20c600c08 8024522: java.time packages missing from src.zip
erikj
parents: 20171
diff changeset
   872
	java				\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   873
	javax/accessibility		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   874
	javax/annotation		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   875
	javax/imageio			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   876
	javax/lang			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   877
	javax/management		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   878
	javax/naming			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   879
	javax/print			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   880
	javax/rmi			\
15130
14a47a69bc62 8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents: 15128
diff changeset
   881
	javax/script			\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   882
	javax/security			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   883
	javax/sound			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   884
	javax/sql			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   885
	javax/swing			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   886
	javax/tools			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   887
	javax/xml			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   888
	org/ietf			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   889
	org/omg				\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   890
	org/w3c/dom			\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   891
	org/xml/sax			\
20324
9ae20c600c08 8024522: java.time packages missing from src.zip
erikj
parents: 20171
diff changeset
   892
        #
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   893
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   894
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
   895
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   896
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/impsrc
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   897
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gendocsrc_rmic
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   898
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   899
  SRC_ZIP_SRCS += $(JDK_TOPDIR)/src/closed/share/classes
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   900
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   901
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   902
# Need to copy launcher src files into desired directory structure
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   903
# before zipping the sources.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   904
LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   905
                      $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/java_md*)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   906
LAUNCHER_ZIP_SRC := $(patsubst $(JDK_TOPDIR)/src/share/bin/%,$(IMAGES_OUTPUTDIR)/src/launcher/%,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   907
		    $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%,$(IMAGES_OUTPUTDIR)/src/launcher/%,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   908
			$(LAUNCHER_SRC_FILES)))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   909
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   910
$(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
   911
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   912
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   913
$(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
   914
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   915
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   916
$(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   917
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   918
# This dir needs to exist before macro is evaluated to avoid warning from find.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   919
$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/src))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   920
$(eval $(call SetupZipArchive,BUILD_SRC_ZIP,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   921
		SRC:=$(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   922
		INCLUDES:=$(SRC_ZIP_INCLUDES) launcher,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   923
		EXCLUDES:=javax/swing/beaninfo,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   924
		SUFFIXES:=.java .c .h,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   925
		ZIP:=$(IMAGES_OUTPUTDIR)/src.zip,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   926
		EXTRA_DEPS:=$(LAUNCHER_ZIP_SRC)))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   927
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   928
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   929
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   930
ifndef OPENJDK
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   931
ifeq ($(OPENJDK_TARGET_OS), windows)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   932
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   933
    $(eval $(call SetupArchive,BUILD_JACCESS_JAR,,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   934
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   935
		INCLUDES:=com/sun/java/accessibility/util,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   936
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   937
		SKIP_METAINF:=true))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   938
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   939
    JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   940
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   941
    ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   942
        $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR,,\
20171
099045062d79 8025160: Recent Java Accessibility Bridge push has make failures
ptbrunet
parents: 19837
diff changeset
   943
		SRCS:=$(JDK_OUTPUTDIR)/classes_ab/32bit,\
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   944
		INCLUDES:=com/sun/java/accessibility,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   945
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   946
		SKIP_METAINF:=true))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   947
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   948
        $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_LEGACY_JAR,,\
20171
099045062d79 8025160: Recent Java Accessibility Bridge push has make failures
ptbrunet
parents: 19837
diff changeset
   949
		SRCS:=$(JDK_OUTPUTDIR)/classes_ab/legacy,\
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   950
		INCLUDES:=com/sun/java/accessibility,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   951
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   952
		SKIP_METAINF:=true))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   953
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   954
        JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   955
		$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   956
    else
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   957
        $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR,,\
20171
099045062d79 8025160: Recent Java Accessibility Bridge push has make failures
ptbrunet
parents: 19837
diff changeset
   958
		SRCS:=$(JDK_OUTPUTDIR)/classes_ab/64bit,\
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   959
		INCLUDES:=com/sun/java/accessibility,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   960
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   961
		SKIP_METAINF:=true))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   962
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   963
        JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   964
    endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   965
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   966
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   967
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   968
##########################################################################################
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14996
diff changeset
   969
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   970
#
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   971
# This is an empty jar (only contains manifest) and fits poorly into framework...
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   972
#   create simple rule instead
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   973
#
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   974
$(IMAGES_OUTPUTDIR)/lib/management-agent.jar : $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   975
	$(JAR) cfm $@ $<
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   976
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   977
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   978
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   979
$(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar : $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   980
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   981
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   982
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   983
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   984
ifeq ($(OPENJDK_TARGET_OS),macosx)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   985
    $(eval $(call SetupArchive,BUILD_JOBJC_JAR,,\
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   986
		SRCS:=$(JDK_OUTPUTDIR)/jobjc_classes,\
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   987
		JAR:=$(IMAGES_OUTPUTDIR)/lib/JObjC.jar, \
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   988
		JARINDEX:=true))
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   989
endif
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   990
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   991
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   992
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   993
ifndef OPENJDK
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   994
    $(eval $(call SetupArchive,BUILD_ALT_RT_JAR,,\
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   995
		SRCS:=$(JDK_OUTPUTDIR)/altclasses_classes,\
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   996
		JAR:=$(IMAGES_OUTPUTDIR)/lib/alt-rt.jar))
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   997
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   998
endif
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   999
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
  1000
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
  1001
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
  1002
# 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
  1003
# 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
  1004
# 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
  1005
$(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
  1006
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
  1007
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
  1008
##########################################################################################
15131
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1009
#
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
  1010
# 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
  1011
#
15131
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1012
$(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP,\
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1013
		SRC:=$(JDK_OUTPUTDIR),\
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1014
		INCLUDES:=classes/javax/net \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1015
			  classes/javax/security/cert \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1016
			  classes/com/sun/net/ssl \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1017
			  classes/com/sun/security/cert \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1018
			  classes/sun/net/www/protocol/https \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1019
			  classes/sun/security/pkcs12 \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1020
			  classes/sun/security/ssl \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1021
			  classes/sun/security/krb5 \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1022
			  classes/sun/security/krb5/internal \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1023
			  classes/sun/security/krb5/internal/ccache \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1024
			  classes/sun/security/krb5/internal/crypto \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1025
			  classes/sun/security/krb5/internal/ktab \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1026
			  classes/sun/security/krb5/internal/rcache \
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1027
			  classes/sun/security/krb5/internal/util,\
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1028
		INCLUDE_FILES:=classes/sun/security/jgss/spi/GSSContextSpi.class,\
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
  1029
		EXCLUDES:=classes/sun/security/krb5/internal/tools,\
15131
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1030
		ZIP:=$(IMAGES_OUTPUTDIR)/sec-bin.zip))
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1031
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1032
JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1033
07014f73ad3b 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15130
diff changeset
  1034
##########################################################################################
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
  1035
#
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1036
# 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
  1037
#
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1038
ifeq ($(OPENJDK_TARGET_OS),windows)
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1039
    # sec-windows-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
  1040
    $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP,\
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1041
		SRC:=$(JDK_OUTPUTDIR),\
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1042
		INCLUDES:=classes/sun/security/krb5/internal/tools,\
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1043
		ZIP:=$(IMAGES_OUTPUTDIR)/sec-windows-bin.zip))
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1044
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1045
    JARS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1046
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1047
    # JGSS files contain the native Kerberos library
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1048
    ifeq ($(OPENJDK_TARGET_CPU),x86_64)
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1049
        JGSS_ZIP_NAME=jgss-windows-x64-bin.zip
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1050
    else
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1051
        JGSS_ZIP_NAME=jgss-windows-i586-bin.zip
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1052
    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
  1053
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1054
    $(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP,\
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1055
		SRC:=$(JDK_OUTPUTDIR),\
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1056
		INCLUDE_FILES:=bin/w2k_lsa_auth.dll \
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1057
			       bin/w2k_lsa_auth.map \
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1058
			       bin/w2k_lsa_auth.pdb,\
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1059
		ZIP:=$(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)))
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1060
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1061
    JARS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1062
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
  1063
81c49c63a316 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15131
diff changeset
  1064
##########################################################################################
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
  1065
16029
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
  1066
# Import nashorn.jar from nashorn dist dir.
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
  1067
$(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
  1068
	$(install-file)
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
  1069
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
  1070
##########################################################################################
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15688
diff changeset
  1071
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
  1072
-include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
  1073
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
  1074
##########################################################################################
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
  1075
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
  1076
all: $(JARS)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
  1077
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
  1078
.PHONY: default all