jdk/make/Tools.gmk
author jwilhelm
Tue, 08 Sep 2015 16:10:37 +0200
changeset 32734 7029a3eb3008
parent 32015 eda394dcd1aa
child 32500 164fa1c0bad8
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
23350
0aac9866d9e5 8010767: Build fails on OEL6 with 16 cores
erikj
parents: 23347
diff changeset
     2
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    26
ifndef _TOOLS_GMK
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    27
_TOOLS_GMK := 1
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    28
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    29
default: all
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    30
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    31
include $(SPEC)
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    32
include MakeBase.gmk
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    33
include JavaCompilation.gmk
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    34
include NativeCompilation.gmk
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25991
diff changeset
    35
include SetupJavaCompilers.gmk
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
    36
28658
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    37
################################################################################
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    38
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    39
$(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    40
    SETUP := GENERATE_OLDBYTECODE, \
32015
eda394dcd1aa 8129881: JDK-8008577 breaks Nashorn test
naoto
parents: 31673
diff changeset
    41
    ADD_JAVAC_FLAGS := "-Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes$(PATH_SEP)$(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes", \
eda394dcd1aa 8129881: JDK-8008577 breaks Nashorn test
naoto
parents: 31673
diff changeset
    42
    SRC := $(JDK_TOPDIR)/make/src/classes $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes, \
28658
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    43
    BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    44
    COPY := boot.modules ext.modules))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    45
28658
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    46
$(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    47
    SRC := $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    48
    DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    49
    FILES := $(wildcard $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    50
28658
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    51
BUILD_TOOLS_JDK += $(COPY_NIMBUS_TEMPLATES)
15693
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15689
diff changeset
    52
28658
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
    53
################################################################################
15693
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15689
diff changeset
    54
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    55
# Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists.
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    56
TOOL_ADDJSUM = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    57
    build.tools.addjsum.AddJsum
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    58
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    59
# The buildmetaindex tool creates a meta-index to make core class loaders lazier.
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    60
TOOL_BUILDMETAINDEX = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    61
    build.tools.buildmetaindex.BuildMetaIndex
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    62
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    63
TOOL_COMPILEFONTCONFIG = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    64
    build.tools.compilefontconfig.CompileFontConfig
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    65
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    66
TOOL_COMPILEPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    67
    build.tools.compileproperties.CompileProperties
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    68
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    69
TOOL_JARREORDER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    70
    build.tools.jarreorder.JarReorder
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    71
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    72
TOOL_GENERATECHARACTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    73
    build.tools.generatecharacter.GenerateCharacter
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    74
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    75
TOOL_CHARACTERNAME = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    76
    build.tools.generatecharacter.CharacterName
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    77
23350
0aac9866d9e5 8010767: Build fails on OEL6 with 16 cores
erikj
parents: 23347
diff changeset
    78
TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(JDK_TOPDIR)/make/data/dtdbuilder \
23568
c92e1347bcac 8038027: DTDBuilder should be run in headless mode
ihse
parents: 23350
diff changeset
    79
    -Djava.awt.headless=true \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    80
    -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.dtdbuilder.DTDBuilder
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    81
23350
0aac9866d9e5 8010767: Build fails on OEL6 with 16 cores
erikj
parents: 23347
diff changeset
    82
TOOL_GENERATEBREAKITERATORDATA = $(JAVA_SMALL) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    83
    -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    84
    build.tools.generatebreakiteratordata.GenerateBreakIteratorData
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    85
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    86
TOOL_GENERATECURRENCYDATA = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    87
    build.tools.generatecurrencydata.GenerateCurrencyData
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    88
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    89
TOOL_HASHER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    90
    build.tools.hasher.Hasher
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    91
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    92
TOOL_TZDB = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
    93
    build.tools.tzdb.TzdbZoneRulesCompiler
15289
3ac550392e43 8003680: JSR 310 Date/Time API
sherman
parents: 15129
diff changeset
    94
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    95
TOOL_BLACKLISTED_CERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
25397
26482834c5bc 8047765: Generate blacklist.certs in build
weijun
parents: 23568
diff changeset
    96
    build.tools.blacklistedcertsconverter.BlacklistedCertsConverter
26482834c5bc 8047765: Generate blacklist.certs in build
weijun
parents: 23568
diff changeset
    97
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
    98
TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
25974
850dc36ea410 6997010: Consolidate java.security files into one file with modifications
weijun
parents: 25397
diff changeset
    99
    build.tools.makejavasecurity.MakeJavaSecurity
850dc36ea410 6997010: Consolidate java.security files into one file with modifications
weijun
parents: 25397
diff changeset
   100
15289
3ac550392e43 8003680: JSR 310 Date/Time API
sherman
parents: 15129
diff changeset
   101
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
   102
# TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   103
# and nbproject/project.properties in the same dir. Needs to be looked at.
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   104
TOOL_JDWPGEN = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.jdwpgen.Main
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   105
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   106
# TODO: Lots of files in jdk/make/tools/CharsetMapping dir
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   107
TOOL_CHARSETMAPPING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
22639
37f4508257fe 8033236: Update GensrcCharsetMapping.gmk to build-infra standards
ihse
parents: 22046
diff changeset
   108
    build.tools.charsetmapping.Main $(LOG_INFO)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   109
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   110
TOOL_SPP = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.spp.Spp
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   111
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   112
# Nimbus is used somewhere in the swing build.
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   113
TOOL_GENERATENIMBUS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
   114
    build.tools.generatenimbus.Generator
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   115
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   116
TOOL_WRAPPERGENERATOR = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
22967
bfcfd51c9e5c 8034193: Move X11 wrapper generator files to make/src and make/data
erikj
parents: 22650
diff changeset
   117
    build.tools.x11wrappergen.WrapperGenerator
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   118
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   119
TOOL_AWT_TOBIN = $(JAVA_SMALL) -Djava.awt.headless=true -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   120
    build.tools.icondata.awt.ToBin
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   121
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   122
TOOL_OSX_TOBIN = $(JAVA_SMALL) -Djava.awt.headless=true -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   123
    build.tools.icondata.osxapp.ToBin
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   124
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   125
TOOL_CLDRCONVERTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20323
diff changeset
   126
    build.tools.cldrconverter.CLDRConverter
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents: 13164
diff changeset
   127
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
   128
TOOL_GENMODULESXML = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   129
    -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \
26227
aa7ada31eb77 8055856: checkdeps build target doesn't work for cross-compilation builds
mchung
parents: 26192
diff changeset
   130
    build.tools.module.GenJdepsModulesXml
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
   131
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   132
TOOL_IMAGEBUILDER = $(JAVA_SMALL) -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   133
    -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   134
    build.tools.module.ImageBuilder
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   135
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   136
##########################################################################################
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   137
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   138
JIMAGE_PKGS := \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   139
    jdk/internal/jimage \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   140
    jdk/internal/jrtfs \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   141
    #
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   142
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   143
$(eval $(call SetupJavaCompilation,BUILD_INTERIM_JIMAGE, \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   144
    SETUP := GENERATE_OLDBYTECODE, \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   145
    SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   146
    INCLUDES := $(JIMAGE_PKGS), \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   147
    BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes))
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   148
28866
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   149
# Because of the explicit INCLUDES in the compilation setup above, the service provider
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   150
# file will not be copied unless META-INF/services would also be added to the INCLUDES.
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   151
# Adding META-INF/services would include all files in that directory when only the one
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   152
# is needed, which is why this explicit copy is defined instead.
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   153
$(eval $(call SetupCopyFiles,COPY_JIMAGE_SERVICE_PROVIDER, \
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   154
    SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   155
    DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes, \
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   156
    FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   157
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   158
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   159
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   160
# Tools needed on solaris because OBJCOPY is broken.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   161
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 20323
diff changeset
   162
ifeq ($(OPENJDK_TARGET_OS), solaris)
28658
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   163
  $(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   164
      SRC := $(JDK_TOPDIR)/make/src/native/add_gnu_debuglink, \
29931
64e274ed6567 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29229
diff changeset
   165
      TOOLCHAIN := TOOLCHAIN_BUILD, \
28658
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   166
      LDFLAGS := -lelf, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   167
      OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/add_gnu_debuglink, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   168
      OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   169
      PROGRAM := add_gnu_debuglink))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   170
28658
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   171
  $(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   172
      SRC := $(JDK_TOPDIR)/make/src/native/fix_empty_sec_hdr_flags, \
29931
64e274ed6567 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29229
diff changeset
   173
      TOOLCHAIN := TOOLCHAIN_BUILD, \
28658
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   174
      LDFLAGS := -lelf, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   175
      OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   176
      OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
344426303820 8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents: 27565
diff changeset
   177
      PROGRAM := fix_empty_sec_hdr_flags))
29229
522667854295 8074072: Race condition in build since JDK-8072842 can cause failed builds on Solaris
erikj
parents: 28866
diff changeset
   178
522667854295 8074072: Race condition in build since JDK-8072842 can cause failed builds on Solaris
erikj
parents: 28866
diff changeset
   179
  BUILD_TOOLS_JDK += $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS)
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 20323
diff changeset
   180
endif
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
   181
28866
7ce02228e8f2 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider
erikj
parents: 28658
diff changeset
   182
$(BUILD_TOOLS_JDK): $(BUILD_INTERIM_JIMAGE) $(COPY_JIMAGE_SERVICE_PROVIDER)
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26227
diff changeset
   183
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
   184
java-tools: $(BUILD_TOOLS_JDK)
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
   185
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
   186
all: java-tools
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
   187
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25397
diff changeset
   188
endif # _TOOLS_GMK