jdk/makefiles/CreateJars.gmk
author erikj
Wed, 05 Dec 2012 10:12:57 +0100
changeset 14596 a1f29d55b5ee
parent 14527 b2b7e2931859
child 14790 9d42784b1823
child 14902 c03055cef158
permissions -rw-r--r--
8004281: build-infra: Move all jar creation to images target and put jars in images/lib Reviewed-by: ohair, tbell, dholmes
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     1
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     2
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
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
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    33
include Tools.gmk
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    34
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    35
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    36
# 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
    37
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    38
MAKEFILE=$(JDK_TOPDIR)/makefiles/CreateJars.gmk
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    39
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    40
MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    41
BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    42
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    43
JARS:=
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    44
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    45
$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/lib))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    46
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
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    49
$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    50
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    51
		SUFFIXES:=.class .gif .png .properties,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    52
		INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    53
		JARMAIN:=sun.tools.jconsole.JConsole,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    54
		JAR:=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    55
		SKIP_METAINF:=true))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    56
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    57
JARS+=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    58
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    59
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    60
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    61
$(eval $(call SetupArchive,BUILD_DNS_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    62
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    63
		INCLUDES:=sun/net/spi/nameservice/dns,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    64
		EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    65
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    66
		SKIP_METAINF:=true))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    67
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    68
JARS+=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    69
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    70
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    71
14334
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    72
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
    73
                              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
    74
                              th tr uk vi zh
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    75
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
    76
LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/,$(LOCALEDATA_INCLUDE_LOCALES)) \
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
    77
		       $(addprefix sun/util/resources/,$(LOCALEDATA_INCLUDE_LOCALES))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    78
14334
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    79
# For non-US English locale data
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    80
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    81
LOCALEDATA_INCLUDES += \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    82
                sun/text/resources/en/FormatData_en_AU.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    83
                sun/text/resources/en/FormatData_en_CA.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    84
                sun/text/resources/en/FormatData_en_GB.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    85
                sun/text/resources/en/FormatData_en_IE.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    86
                sun/text/resources/en/FormatData_en_IN.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    87
                sun/text/resources/en/FormatData_en_MT.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    88
                sun/text/resources/en/FormatData_en_NZ.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    89
                sun/text/resources/en/FormatData_en_PH.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    90
                sun/text/resources/en/FormatData_en_SG.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    91
                sun/text/resources/en/FormatData_en_ZA.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    92
                sun/util/resources/en/CalendarData_en_GB.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    93
                sun/util/resources/en/CalendarData_en_IE.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    94
                sun/util/resources/en/CalendarData_en_MT.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    95
                sun/util/resources/en/CurrencyNames_en_AU.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    96
                sun/util/resources/en/CurrencyNames_en_CA.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    97
                sun/util/resources/en/CurrencyNames_en_GB.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    98
                sun/util/resources/en/CurrencyNames_en_IE.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
    99
                sun/util/resources/en/CurrencyNames_en_IN.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   100
                sun/util/resources/en/CurrencyNames_en_MT.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   101
                sun/util/resources/en/CurrencyNames_en_NZ.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   102
                sun/util/resources/en/CurrencyNames_en_PH.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   103
                sun/util/resources/en/CurrencyNames_en_SG.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   104
                sun/util/resources/en/CurrencyNames_en_ZA.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   105
                sun/util/resources/en/LocaleNames_en_MT.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   106
                sun/util/resources/en/LocaleNames_en_PH.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   107
                sun/util/resources/en/LocaleNames_en_SG.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   108
                sun/util/resources/en/TimeZoneNames_en_CA.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   109
                sun/util/resources/en/TimeZoneNames_en_GB.class \
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   110
                sun/util/resources/en/TimeZoneNames_en_IE.class
43556afc3c04 8001231: Move locale data out of rt.jar (except the US locale)
naoto
parents: 14326
diff changeset
   111
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   112
$(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   113
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   114
		SUFFIXES:=.class _dict _th,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   115
		INCLUDES:=$(LOCALEDATA_INCLUDES),\
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   116
		EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   117
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   118
		SKIP_METAINF:=true))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   119
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   120
JARS+=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   121
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   122
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   123
# rt.jar and resources.jar are being built in the same way as in the old build. They require
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   124
# the files to be in a certain order and converting that is not easy and will not be needed
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   125
# in jigsaw anyway.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   126
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   127
# Exclude list for rt.jar and resources.jar
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   128
RT_JAR_EXCLUDES := \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   129
	com/sun/javadoc \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   130
	com/sun/jdi \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   131
	com/sun/jarsigner \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   132
	com/sun/source \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   133
	com/sun/istack/internal/tools \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   134
	META-INF/services/com.sun.jdi.connect.Connector \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   135
	META-INF/services/com.sun.jdi.connect.spi.TransportService \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   136
	META-INF/services/com.sun.tools.xjc.Plugin \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   137
	com/sun/tools \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   138
	sun/jvmstat \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   139
	sun/nio/cs/ext \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   140
	sun/awt/HKSCS.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   141
	sun/awt/motif/X11GB2312\$$$$Decoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   142
	sun/awt/motif/X11GB2312\$$$$Encoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   143
	sun/awt/motif/X11GB2312.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   144
	sun/awt/motif/X11GBK\$$$$Encoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   145
	sun/awt/motif/X11GBK.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   146
	sun/awt/motif/X11KSC5601\$$$$Decoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   147
	sun/awt/motif/X11KSC5601\$$$$Encoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   148
	sun/awt/motif/X11KSC5601.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   149
	META-INF/services/java.nio.charset.spi.CharsetProvider \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   150
	sun/rmi/rmic \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   151
	sun/tools/asm \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   152
	sun/tools/java \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   153
	sun/tools/javac \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   154
	com/sun/tools/classfile \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   155
	com/sun/tools/javap \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   156
	sun/tools/jcmd \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   157
	sun/tools/jconsole \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   158
	sun/tools/jps \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   159
	sun/tools/jstat \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   160
	sun/tools/jstatd \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   161
	sun/tools/native2ascii \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   162
	sun/tools/serialver \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   163
	sun/tools/tree \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   164
	sun/tools/util \
14344
a5537423264b 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14235
diff changeset
   165
	sun/security/tools/jarsigner \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   166
	sun/security/provider/Sun.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   167
	sun/security/rsa/SunRsaSign.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   168
	sun/security/ssl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   169
	sun/security/ec/ECDHKeyAgreement.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   170
	sun/security/ec/ECDSASignature\$$$$Raw.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   171
	sun/security/ec/ECDSASignature\$$$$SHA1.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   172
	sun/security/ec/ECDSASignature\$$$$SHA224.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   173
	sun/security/ec/ECDSASignature\$$$$SHA256.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   174
	sun/security/ec/ECDSASignature\$$$$SHA384.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   175
	sun/security/ec/ECDSASignature\$$$$SHA512.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   176
	sun/security/ec/ECDSASignature.class \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   177
	sun/security/ec/ECKeyFactory.class \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   178
	sun/security/ec/ECKeyPairGenerator.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   179
	sun/security/ec/SunEC\$$$$1.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   180
	sun/security/ec/SunEC.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   181
	sun/security/ec/SunECEntries.class \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   182
	sun/security/mscapi \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   183
	sun/security/pkcs11 \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   184
	com/sun/net/ssl/internal/ssl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   185
	javax/crypto \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   186
	sun/security/internal \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   187
	com/sun/crypto/provider \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   188
	META-INF/services/com.sun.tools.attach.spi.AttachProvider \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   189
	com/sun/tools/attach \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   190
	org/relaxng/datatype \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   191
	com/sun/codemodel \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   192
	com/sun/xml/internal/dtdparser \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   193
	com/sun/xml/internal/rngom \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   194
	com/sun/xml/internal/xsom \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   195
	com/sun/tools/script/shell \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   196
	sun/tools/attach \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   197
	sun/tools/jstack \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   198
	sun/tools/jinfo \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   199
	sun/tools/jmap \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   200
	sun/net/spi/nameservice/dns \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   201
	META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   202
	javax/swing/beaninfo \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   203
	javax/swing/AbstractButtonBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   204
	javax/swing/BoxBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   205
	javax/swing/JAppletBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   206
	javax/swing/JButtonBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   207
	javax/swing/JCheckBoxBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   208
	javax/swing/JCheckBoxMenuItemBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   209
	javax/swing/JColorChooserBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   210
	javax/swing/JComboBoxBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   211
	javax/swing/JComponentBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   212
	javax/swing/JDesktopPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   213
	javax/swing/JDialogBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   214
	javax/swing/JEditorPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   215
	javax/swing/JFileChooserBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   216
	javax/swing/JFormattedTextFieldBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   217
	javax/swing/JFrameBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   218
	javax/swing/JInternalFrameBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   219
	javax/swing/JLabelBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   220
	javax/swing/JLayeredPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   221
	javax/swing/JListBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   222
	javax/swing/JMenuBarBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   223
	javax/swing/JMenuBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   224
	javax/swing/JMenuItemBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   225
	javax/swing/JOptionPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   226
	javax/swing/JPanelBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   227
	javax/swing/JPasswordFieldBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   228
	javax/swing/JPopupMenuBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   229
	javax/swing/JProgressBarBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   230
	javax/swing/JRadioButtonBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   231
	javax/swing/JRadioButtonMenuItemBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   232
	javax/swing/JScrollBarBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   233
	javax/swing/JScrollPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   234
	javax/swing/JSeparatorBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   235
	javax/swing/JSliderBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   236
	javax/swing/JSpinnerBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   237
	javax/swing/JSplitPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   238
	javax/swing/JTabbedPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   239
	javax/swing/JTableBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   240
	javax/swing/JTextAreaBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   241
	javax/swing/JTextFieldBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   242
	javax/swing/JTextPaneBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   243
	javax/swing/JToggleButtonBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   244
	javax/swing/JToolBarBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   245
	javax/swing/JTreeBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   246
	javax/swing/JWindowBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   247
	javax/swing/SwingBeanInfoBase.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   248
	javax/swing/text/JTextComponentBeanInfo.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   249
	sun/swing/BeanInfoUtils.class \
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   250
	$(LOCALEDATA_INCLUDES) \
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   251
	sun/text/resources/cldr \
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   252
	sun/util/resources/cldr \
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   253
	sun/util/cldr/CLDRLocaleDataMetaInfo.class
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   254
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   255
# These files should never be put into rt.jar
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   256
# but due to a misstake...some are put there if embedded
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   257
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   258
ifneq ($(JAVASE_EMBEDDED), true)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   259
# normal (correct) case
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   260
RT_JAR_EXCLUDES += \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   261
	com/oracle/jrockit/jfr \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   262
	oracle/jrockit/jfr
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   263
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   264
# embedded (broken) case
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   265
RT_JAR_EXCLUDES += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   266
  oracle/jrockit/jfr/parser \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   267
  oracle/jrockit/jfr/tools \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   268
  oracle/jrockit/jfr/NativeOptions.class \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   269
  oracle/jrockit/jfr/RepositoryChunkHandler.class
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   270
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   271
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   272
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   273
        RT_JAR_EXCLUDES += com/sun/nio/sctp \
14425
0005b8b4ec0b 8003161: small fixes to re-enable new build system
ohrstrom
parents: 14345
diff changeset
   274
                           sun/nio/ch/sctp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   275
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   276
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   277
# Find all files in the classes dir to use as dependencies. This could be more fine granular.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   278
ALL_FILES_IN_CLASSES := $(shell $(FIND) $(JDK_OUTPUTDIR)/classes -type f \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   279
			| $(GREP) -v -e '/_the\.*' -e '^_the\.*' -e 'javac_state')
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   280
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   281
RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar_manifest
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   282
RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar_manifest
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   283
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   284
$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   285
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   286
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   287
	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" 		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   288
	       -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   289
	       $(MAINMANIFEST) >> $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   290
	$(ECHO) >> $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   291
	$(CAT) $(BEANMANIFEST) >> $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   292
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   293
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   294
$(RESOURCE_JAR_MANIFEST_FILE): $(MAINMANIFEST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   295
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   296
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   297
	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" 		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   298
	       -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   299
	       $(MAINMANIFEST) >> $@.tmp
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
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   302
$(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude: $(MAKEFILE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   303
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   304
	$(RM) $@ $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   305
	$(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   306
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   307
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   308
$(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
   309
  $(MAKEFILE)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   310
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   311
	$(RM) $@ $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   312
	$(TOOL_ADDJSUM) $< $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   313
	$(MV) $@.tmp $@
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   314
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   315
$(IMAGES_OUTPUTDIR)/lib/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   316
					 $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   317
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   318
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   319
	($(CD) $(JDK_OUTPUTDIR)/classes && \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   320
	    $(TOOL_JARREORDER) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   321
		-o  $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude . )
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   322
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   323
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   324
$(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   325
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   326
	$(RM) $@ $@.tmp
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   327
	$(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   328
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   329
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   330
$(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   331
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   332
	$(RM) $@ $@.tmp
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   333
	$(GREP) -v -e '\.class$$' \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   334
	    -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   335
	    $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   336
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   337
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   338
RT_JAR_CREATE_OPTIONS := c0fm
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   339
ifeq ($(COMPRESS_JARS), true)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   340
    RT_JAR_CREATE_OPTIONS := cfm
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   341
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   342
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   343
$(IMAGES_OUTPUTDIR)/lib/rt.jar: $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   344
	$(ECHO) Creating rt.jar
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   345
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   346
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   347
	$(CD) $(JDK_OUTPUTDIR)/classes && \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   348
	    $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   349
	        @$(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   350
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   351
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   352
$(IMAGES_OUTPUTDIR)/lib/resources.jar: $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   353
				    $(RESOURCE_JAR_MANIFEST_FILE)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   354
	$(ECHO) Creating resources.jar
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   355
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   356
	$(RM) $@ $@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   357
	$(CD) $(JDK_OUTPUTDIR)/classes && \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   358
	    $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   359
	        @$(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   360
	$(MV) $@.tmp $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   361
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   362
JARS+=$(IMAGES_OUTPUTDIR)/lib/rt.jar $(IMAGES_OUTPUTDIR)/lib/resources.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   363
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   364
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   365
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   366
ifneq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   367
    CHARSETS_EXTRA_FILES:=sun/awt/motif/X11GBK.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   368
                          sun/awt/motif/X11GB2312\$$$$Decoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   369
                          sun/awt/motif/X11GB2312.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   370
                          sun/awt/motif/X11KSC5601\$$$$Decoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   371
                          sun/awt/motif/X11KSC5601\$$$$Encoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   372
                          sun/awt/motif/X11GB2312\$$$$Encoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   373
                          sun/awt/motif/X11GBK\$$$$Encoder.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   374
                          sun/awt/motif/X11KSC5601.class
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   375
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   376
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   377
$(eval $(call SetupArchive,BUILD_CHARSETS_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   378
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   379
		SUFFIXES:=.class .dat,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   380
		INCLUDES:=sun/nio/cs/ext,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   381
		EXTRA_FILES := sun/awt/HKSCS.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   382
			       $(CHARSETS_EXTRA_FILES) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   383
                               META-INF/services/java.nio.charset.spi.CharsetProvider, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   384
		JAR:=$(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   385
		SKIP_METAINF := true, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   386
                CHECK_COMPRESS_JAR:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   387
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   388
JARS+=$(IMAGES_OUTPUTDIR)/lib/charsets.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   389
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   390
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   391
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   392
ifndef OPENJDK
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   393
ifeq ($(ENABLE_JFR), true)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   394
    $(eval $(call SetupArchive,BUILD_JFR_JAR,,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   395
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   396
		INCLUDES:=com/oracle/jrockit/jfr \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   397
			  oracle/jrockit/jfr,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   398
		JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   399
		SKIP_METAINF:=true,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   400
		MANIFEST:=$(MAINMANIFEST), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   401
                CHECK_COMPRESS_JAR:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   402
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   403
    JARS+=$(IMAGES_OUTPUTDIR)/lib/jfr.jar
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   404
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   405
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   406
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   407
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   408
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   409
$(eval $(call SetupArchive,BUILD_JSSE_JAR,,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   410
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   411
		INCLUDES:=sun/security/provider/Sun.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   412
			  sun/security/rsa/SunRsaSign.class \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   413
			  sun/security/ssl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   414
			  com/sun/net/ssl/internal/ssl,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   415
		JAR:=$(IMAGES_OUTPUTDIR)/lib/jsse.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   416
		SKIP_METAINF:=true,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   417
		MANIFEST:=$(MAINMANIFEST), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   418
                CHECK_COMPRESS_JAR:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   419
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   420
JARS+=$(IMAGES_OUTPUTDIR)/lib/jsse.jar
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
##########################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   440
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   441
SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   442
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   443
ifndef OPENJDK
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   444
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   445
    SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   446
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   447
    $(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   448
	@$(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
   449
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   450
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   451
else
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   452
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   453
    $(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   454
	SRCS:=$(JDK_OUTPUTDIR)/classes, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   455
	SUFFIXES:=.class,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   456
	INCLUDES:=sun/security/pkcs11,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   457
	JAR:=$(SUNPKCS11_JAR_DST), \
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   458
        MANIFEST:=$(JCE_MANIFEST), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   459
	SKIP_METAINF := true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   460
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   461
    $(SUNPKCS11_JAR_DST): $(JCE_MANIFEST)
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   462
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   463
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   464
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   465
JARS += $(SUNPKCS11_JAR_DST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   466
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   467
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   468
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   469
SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   470
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   471
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   472
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   473
    SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   474
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   475
    $(SUNEC_JAR_DST) : $(SUNEC_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   476
	@$(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
   477
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   478
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   479
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   480
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   481
    $(eval $(call SetupArchive,BUILD_SUNEC_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   482
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   483
		SUFFIXES:=.class,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   484
		INCLUDES:=sun/security/ec,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   485
		JAR:=$(SUNEC_JAR_DST), \
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   486
                MANIFEST:=$(JCE_MANIFEST), \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   487
		SKIP_METAINF := true))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   488
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   489
    $(SUNEC_JAR_DST): $(JCE_MANIFEST)
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   490
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   491
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   492
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   493
JARS += $(SUNEC_JAR_DST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   494
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   495
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   496
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   497
$(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   498
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   499
		SUFFIXES:=BeanInfo.class .gif,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   500
		INCLUDES:=javax/swing sun/swing,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   501
		EXCLUDES:=javax/swing/plaf,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   502
		EXTRA_FILES:=javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   503
		JAR:=$(IMAGES_OUTPUTDIR)/lib/dt.jar,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   504
		SKIP_METAINF:=true))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   505
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   506
JARS+=$(IMAGES_OUTPUTDIR)/lib/dt.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   507
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   508
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   509
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   510
SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   511
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   512
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   513
    SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   514
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   515
    $(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   516
	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunJCE provider..."
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   517
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   518
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   519
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   520
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   521
    $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   522
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   523
		SUFFIXES:=.class,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   524
		INCLUDES:= com/sun/crypto/provider,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   525
		JAR:=$(SUNJCE_PROVIDER_JAR_DST), \
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   526
                MANIFEST:=$(JCE_MANIFEST), \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   527
		SKIP_METAINF := true))
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   528
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   529
    $(SUNJCE_PROVIDER_JAR_DST): $(JCE_MANIFEST)
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   530
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   531
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   532
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   533
JARS += $(SUNJCE_PROVIDER_JAR_DST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   534
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   535
JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   536
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   537
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   538
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   539
    JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   540
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   541
    $(JCE_JAR_DST) : $(JCE_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   542
	@$(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
   543
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   544
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   545
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   546
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   547
    $(eval $(call SetupArchive,BUILD_JCE_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   548
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   549
		SUFFIXES:=.class,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   550
		INCLUDES:= javax/crypto sun/security/internal,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   551
		JAR:=$(JCE_JAR_DST), \
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   552
                MANIFEST:=$(JCE_MANIFEST), \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   553
		SKIP_METAINF := true))
14527
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   554
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   555
    $(JCE_JAR_DST): $(JCE_MANIFEST)
b2b7e2931859 8003482: build-infra: Use correct manifest in security jars
erikj
parents: 14425
diff changeset
   556
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   557
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   558
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   559
JARS += $(JCE_JAR_DST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   560
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   561
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   562
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   563
US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   564
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   565
ifndef OPENJDK
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   566
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   567
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   568
    $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   569
	$(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
   570
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   571
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   572
else
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   573
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   574
    #
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   575
    # TODO fix so that SetupArchive does not write files into SRCS
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   576
    #   then we don't need this extra copying
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   577
    #
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   578
    # NOTE:  We currently do not place restrictions on our limited export
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   579
    # policy.  This was not a typo.
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   580
    #
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   581
    US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   582
    US_EXPORT_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/US_export_policy_jar.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   583
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   584
    $(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   585
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   586
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   587
    US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   588
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   589
    $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR,$(US_EXPORT_POLICY_JAR_DEPS),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   590
		SRCS:=$(US_EXPORT_POLICY_JAR_TMP), \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   591
		SUFFIXES:= .policy,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   592
		JAR:=$(US_EXPORT_POLICY_JAR_DST), \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   593
		EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   594
		SKIP_METAINF := true))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   595
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   596
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   597
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   598
JARS += $(US_EXPORT_POLICY_JAR_DST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   599
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   600
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
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
LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   603
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   604
ifndef OPENJDK
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   605
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   606
    $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   607
	$(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
   608
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   609
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   610
else
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   611
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   612
    #
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   613
    # TODO fix so that SetupArchive does not write files into SRCS
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   614
    #   then we don't need this extra copying
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   615
    #
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   616
    LOCAL_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/local_policy_jar.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   617
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   618
    ifeq ($(UNLIMITED_CRYPTO), true)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   619
        LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   620
        LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   621
        LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   622
    else
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   623
        LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   624
        LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   625
                                 $(LOCAL_POLICY_JAR_TMP)/default_local.policy
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   626
        LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   627
    endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   628
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   629
    $(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/%
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   630
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   631
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   632
    $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR,$(LOCAL_POLICY_JAR_DEPS),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   633
		SRCS:=$(LOCAL_POLICY_JAR_TMP),\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   634
		SUFFIXES:= .policy,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   635
		JAR:=$(LOCAL_POLICY_JAR_DST), \
14234
85a37ece2d5e 8001898: build-infra: correct exclusion lists for mac jar builds
erikj
parents: 14231
diff changeset
   636
		EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   637
		SKIP_METAINF := true))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   638
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   639
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   640
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   641
JARS += $(LOCAL_POLICY_JAR_DST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   642
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   643
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   644
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   645
ifeq ($(OPENJDK_TARGET_OS),windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   646
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   647
SUNMSCAPI_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   648
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   649
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   650
SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   651
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   652
$(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   653
	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunMSCAPI provider..."
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   654
	$(install-file)
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
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   657
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   658
$(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   659
		SRCS:=$(JDK_OUTPUTDIR)/classes, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   660
		SUFFIXES:=.class,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   661
		INCLUDES:= sun/security/mscapi,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   662
		JAR:=$(SUNMSCAPI_JAR_DST), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   663
		SKIP_METAINF:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   664
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   665
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   666
JARS += $(SUNMSCAPI_JAR_DST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   667
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   668
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   669
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   670
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   671
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   672
ifeq ($(OPENJDK_TARGET_OS),solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   673
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   674
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   675
UCRYPTO_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   676
UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   677
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   678
$(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   679
	@$(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
   680
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   681
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   682
JARS += $(UCRYPTO_JAR_DST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   683
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   684
endif
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
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   689
# Get the CLDRVERSION
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   690
include GensrcCLDR.gmk
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   691
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   692
CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   693
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   694
$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR,,\
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   695
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   696
		SUFFIXES:=.class,\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   697
		INCLUDES:=sun/text/resources/cldr \
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   698
			  sun/util/cldr \
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   699
			  sun/util/resources/cldr,\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   700
		EXCLUDES:=sun/util/cldr/CLDRLocaleProviderAdapter,\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   701
		JAR:=$(CLDRDATA_JAR_DST),\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   702
		EXTRA_MANIFEST_ATTR:=CLDR-Version: $(CLDRVERSION),\
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   703
		SKIP_METAINF:=true))
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   704
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   705
JARS += $(CLDRDATA_JAR_DST)
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   706
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   707
##########################################################################################
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13353
diff changeset
   708
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   709
TOOLS_JAR_INCLUDES := \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   710
	sun/tools/asm		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   711
	sun/tools/jar		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   712
	sun/tools/java		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   713
	sun/tools/javac		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   714
	sun/tools/jcmd		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   715
	sun/tools/jps		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   716
	sun/tools/jstat		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   717
	sun/tools/jstatd	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   718
	sun/tools/native2ascii	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   719
	sun/tools/serialver	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   720
	sun/tools/tree		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   721
	sun/tools/util		\
14344
a5537423264b 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14235
diff changeset
   722
	sun/security/tools/jarsigner \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   723
	sun/rmi/rmic		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   724
	sun/applet		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   725
	sun/jvmstat		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   726
	com/sun/javadoc		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   727
	com/sun/jdi		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   728
	com/sun/jarsigner	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   729
	com/sun/source          \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   730
	com/sun/tools/classfile \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   731
	com/sun/tools/doclets   \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   732
	com/sun/tools/example/debug/expr \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   733
	com/sun/tools/example/debug/tty  \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   734
	com/sun/tools/extcheck  \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   735
	com/sun/tools/hat       \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   736
	com/sun/tools/javac     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   737
	com/sun/tools/javadoc   \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   738
	com/sun/tools/javah     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   739
	com/sun/tools/javap     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   740
	com/sun/tools/corba     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   741
	com/sun/tools/internal/xjc       \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   742
	com/sun/tools/internal/ws       \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   743
	com/sun/istack/internal/tools       \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   744
	com/sun/tools/internal/jxc/ap   \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   745
	com/sun/tools/internal/ws/wscompile/plugin/at_generated \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   746
        com/sun/codemodel       \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   747
        com/sun/tools/internal/jxc             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   748
        com/sun/xml/internal/rngom       \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   749
        com/sun/xml/internal/xsom       \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   750
        org/relaxng/datatype   \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   751
	com/sun/xml/internal/dtdparser \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   752
	com/sun/tools/jdi	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   753
	com/sun/tools/script/shell	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   754
	com/sun/tools/attach	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   755
	sun/tools/attach	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   756
	sun/tools/jstack        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   757
	sun/tools/jinfo         \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   758
	sun/tools/jmap
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   759
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   760
# The sjavac tools is not ready for public consumption.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   761
TOOLS_JAR_EXCLUDES=com/sun/tools/sjavac
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   762
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   763
$(eval $(call SetupArchive,BUILD_TOOLS_JAR,,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   764
		SRCS:=$(JDK_OUTPUTDIR)/classes,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   765
		SUFFIXES:=.class .prp .gif .properties .xml .css .xsd .js .html .txt .java \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   766
			  Tool aliasmap options,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   767
		INCLUDES:=$(TOOLS_JAR_INCLUDES),\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   768
		EXCLUDES:=$(TOOLS_JAR_EXCLUDES),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   769
		EXTRA_FILES:=META-INF/services/com.sun.jdi.connect.Connector \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   770
			     META-INF/services/com.sun.jdi.connect.spi.TransportService \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   771
			     META-INF/services/com.sun.tools.attach.spi.AttachProvider \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   772
			     META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   773
			     META-INF/services/com.sun.tools.internal.xjc.Plugin,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   774
		JAR:=$(IMAGES_OUTPUTDIR)/lib/tools.jar,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   775
		SKIP_METAINF:=true, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   776
                CHECK_COMPRESS_JAR:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   777
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   778
JARS+=$(IMAGES_OUTPUTDIR)/lib/tools.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   779
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   780
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   781
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   782
include javadoc/CORE_PKGS.gmk
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   783
include javadoc/NON_CORE_PKGS.gmk
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   784
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   785
# The compiler should not issue a "Proprietary" warning when compiling
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   786
# classes in the com.sun.java.swing.plaf packages, since we've always
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   787
# allowed, and even advocated, extending them (see bug 6476749).
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   788
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   789
# 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
   790
# compiler warnings for non-core packages. The correct way is to document
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   791
# 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
   792
# definition.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   793
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   794
# Swing has taken this approach only as a temporary measure to avoid
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   795
# the compiler warnings until we can properly document these packages.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   796
# This is covered under 6491853.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   797
EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows  \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   798
                        com.sun.java.swing.plaf.motif    \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   799
                        com.sun.java.swing.plaf.gtk
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   800
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   801
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   802
# Include the exported private packages in ct.sym.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   803
# This is an interim solution until the ct.sym is replaced
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   804
# with a new module system (being discussed for JDK 8).
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   805
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   806
EXPORTED_PRIVATE_PKGS = com.sun.servicetag \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   807
                        com.oracle.net \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   808
                        com.oracle.nio
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   809
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   810
$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   811
	$(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   812
	$(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   813
	$(JAVA) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   814
		-Xbootclasspath/a:$(JDK_OUTPUTDIR)/classes \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   815
		$(JAVAC_JARS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   816
	    -XDprocess.packages -proc:only \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   817
	    -processor com.sun.tools.javac.sym.CreateSymbols \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   818
	    -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   819
	    -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   820
	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   821
	$(TOUCH) $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   822
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   823
$(shell $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   824
$(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   825
		SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   826
		INCLUDES:=META-INF/sym,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   827
		JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   828
		CHECK_COMPRESS_JAR:=true))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   829
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   830
JARS+=$(IMAGES_OUTPUTDIR)/lib/ct.sym
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   831
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   832
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   833
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   834
SRC_ZIP_INCLUDES = \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   835
	java/applet			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   836
	java/awt			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   837
	java/beans			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   838
	java/io				\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   839
	java/lang			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   840
	java/math			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   841
	java/net			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   842
	java/nio			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   843
	java/rmi			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   844
	java/security			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   845
	java/sql			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   846
	java/text			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   847
	java/util			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   848
	com/sun/corba			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   849
	com/sun/image/codec/jpeg	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   850
	com/sun/imageio                 \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   851
	com/sun/java/swing		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   852
	com/sun/javadoc			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   853
	com/sun/jmx			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   854
	com/sun/source			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   855
	com/sun/naming			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   856
	com/sun/security/auth		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   857
	com/sun/security/jgss		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   858
	javax/accessibility		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   859
	javax/annotation		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   860
	javax/script			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   861
	javax/imageio			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   862
	javax/lang			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   863
	javax/management		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   864
	javax/naming			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   865
	javax/print			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   866
	javax/rmi			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   867
	javax/security			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   868
	javax/sound			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   869
	javax/sql			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   870
	javax/swing			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   871
	javax/tools			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   872
	javax/xml			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   873
	com/sun/org/apache		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   874
	com/sun/java_cup		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   875
	com/sun/jlex	        	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   876
	org/ietf			\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   877
	org/omg				\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   878
	org/w3c/dom			\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   879
	org/xml/sax			\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   880
	sunw
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   881
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   882
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
   883
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   884
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/impsrc
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   885
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gendocsrc_rmic
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   886
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   887
  SRC_ZIP_SRCS += $(JDK_TOPDIR)/src/closed/share/classes
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   888
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   889
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   890
# Need to copy launcher src files into desired directory structure
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   891
# before zipping the sources.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   892
LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   893
                      $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/java_md*)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   894
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
   895
		    $(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
   896
			$(LAUNCHER_SRC_FILES)))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   897
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   898
$(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
   899
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   900
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   901
$(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
   902
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   903
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   904
$(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   905
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   906
# 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
   907
$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/src))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   908
$(eval $(call SetupZipArchive,BUILD_SRC_ZIP,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   909
		SRC:=$(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   910
		INCLUDES:=$(SRC_ZIP_INCLUDES) launcher,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   911
		EXCLUDES:=javax/swing/beaninfo,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   912
		SUFFIXES:=.java .c .h,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   913
		ZIP:=$(IMAGES_OUTPUTDIR)/src.zip,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   914
		EXTRA_DEPS:=$(LAUNCHER_ZIP_SRC)))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   915
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   916
JARS+=$(IMAGES_OUTPUTDIR)/src.zip
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   917
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   918
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   919
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   920
#
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   921
# 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
   922
#   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
   923
#
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   924
$(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
   925
	$(JAR) cfm $@ $<
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   926
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   927
JARS += $(IMAGES_OUTPUTDIR)/lib/management-agent.jar
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   928
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   929
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   930
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   931
$(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
   932
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   933
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   934
JARS += $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   935
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   936
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   937
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   938
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
   939
    $(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
   940
		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
   941
		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
   942
		JARINDEX:=true))
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   943
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   944
    JARS += $(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
   945
endif
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   946
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   947
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   948
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   949
ifndef OPENJDK
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   950
    $(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
   951
		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
   952
		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
   953
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   954
    JARS += $(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
   955
endif
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   956
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   957
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   958
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   959
# 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
   960
# 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
   961
# 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
   962
$(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
   963
	$(install-file)
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   964
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   965
JARS += $(IMAGES_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
   966
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   967
##########################################################################################
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14527
diff changeset
   968
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   969
-include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   970
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   971
##########################################################################################
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13583
diff changeset
   972
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   973
all: $(JARS)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   974
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   975
.PHONY: default all