author | ihse |
Mon, 03 Dec 2018 18:46:10 +0100 | |
changeset 52804 | 28094715ae71 |
parent 52595 | 16609197022c |
child 54380 | e297c7bb6469 |
permissions | -rw-r--r-- |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
52804
28094715ae71
8214718: Update missing copyright year in build system
ihse
parents:
52595
diff
changeset
|
2 |
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
4 |
# |
6ec26f6cc53e
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 |
6ec26f6cc53e
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 |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
10 |
# |
6ec26f6cc53e
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 |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
6ec26f6cc53e
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 |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
15 |
# accompanied this code). |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
16 |
# |
6ec26f6cc53e
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 |
6ec26f6cc53e
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, |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
20 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
6ec26f6cc53e
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 |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
23 |
# questions. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
24 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
25 |
|
33438 | 26 |
ifndef _JAR_ARCHIVE_GMK |
27 |
_JAR_ARCHIVE_GMK := 1 |
|
25854 | 28 |
|
20363 | 29 |
ifeq (,$(_MAKEBASE_GMK)) |
33438 | 30 |
$(error You must include MakeBase.gmk prior to including JarArchive.gmk) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
31 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
32 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
33 |
FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
34 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
35 |
# Setup make rules for creating a jar archive. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
36 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
37 |
# Parameter 1 is the name of the rule. This name is used as variable prefix, |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
38 |
# and the targets generated are listed in a variable by that name. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
39 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
40 |
# Remaining parameters are named arguments. These include: |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
41 |
# DEPENDENCIES:=List of dependencies for the jar target. If left empty, |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
42 |
# dependencies are calculated automatically from the source files found. |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
43 |
# For this to work, the source files must exist when the makefile is |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
44 |
# parsed. |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
45 |
# SRCS:=List of directories in where to find files to add to archive |
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52065
diff
changeset
|
46 |
# BIN:=Directory where to store build control files |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
47 |
# SUFFIXES:=File suffixes to include in jar |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
48 |
# INCLUDES:=List of directories/packages in SRCS that should be included |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
49 |
# EXCLUDES:=List of directories/packages in SRCS that should be excluded |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
50 |
# EXCLUDE_FILES:=List of files in SRCS that should be excluded |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
51 |
# EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
52 |
# JAR:=Jar file to create |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
53 |
# MANIFEST:=Optional manifest file template. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
54 |
# JARMAIN:=Optional main class to add to manifest |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
55 |
# JARINDEX:=true means generate the index in the jar file. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
56 |
# SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
57 |
# added to the archive. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
58 |
# EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
59 |
# CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable |
48069
a358ebcfacfb
8192771: Boot JDK jar tool used to construct the modular JAR for java.jnlp
erikj
parents:
47253
diff
changeset
|
60 |
# JAR_CMD:=Optionally override the jar command to use when creating the archive. |
33438 | 61 |
SetupJarArchive = $(NamedParamsMacroTemplate) |
62 |
define SetupJarArchiveBody |
|
14111 | 63 |
|
20363 | 64 |
$1_JARMAIN:=$(strip $$($1_JARMAIN)) |
65 |
$1_JARNAME:=$$(notdir $$($1_JAR)) |
|
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52065
diff
changeset
|
66 |
$1_JAR_OUTPUT_DIR := $$(patsubst %/, %, $$(dir $$($1_JAR))) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52065
diff
changeset
|
67 |
$$(call SetIfEmpty, $1_BIN, $$($1_JAR_OUTPUT_DIR)) |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52065
diff
changeset
|
68 |
$1_MANIFEST_FILE:=$$($1_BIN)/_the.$$($1_JARNAME)_manifest |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52065
diff
changeset
|
69 |
$1_DELETESS_FILE:=$$($1_BIN)/_the.$$($1_JARNAME)_deletess |
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52065
diff
changeset
|
70 |
$1_DELETES_FILE:=$$($1_BIN)/_the.$$($1_JARNAME)_deletes |
48069
a358ebcfacfb
8192771: Boot JDK jar tool used to construct the modular JAR for java.jnlp
erikj
parents:
47253
diff
changeset
|
71 |
$$(call SetIfEmpty, $1_JAR_CMD, $$(JAR)) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
72 |
|
20363 | 73 |
ifeq (,$$($1_SUFFIXES)) |
74 |
# No suffix was set, default to classes. |
|
75 |
$1_SUFFIXES:=.class |
|
76 |
endif |
|
77 |
# Convert suffixes to a find expression |
|
78 |
$1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES)) |
|
79 |
# On windows, a lot of includes/excludes risk making the command line too long, so |
|
80 |
# writing the grep patterns to files. |
|
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
81 |
# Grep returns 1 if nothing is matched. Do not fail the build for this. |
20363 | 82 |
ifneq (,$$($1_INCLUDES)) |
25854 | 83 |
$1_GREP_INCLUDE_PATTERNS:=$$(call EscapeDollar, \ |
84 |
$$(foreach src,$$($1_SRCS), $$(addprefix $$(src)/,$$($1_INCLUDES)))) |
|
20363 | 85 |
# If there are a lot of include patterns, output to file to shorten command lines |
86 |
ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),) |
|
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
87 |
$1_GREP_INCLUDES:=| ( $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS)) \ |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
88 |
|| test "$$$$?" = "1" ) |
20363 | 89 |
else |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
90 |
$1_GREP_INCLUDE_OUTPUT = \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
91 |
$$(eval $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS, \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
92 |
$$($1_BIN)/_the.$$($1_JARNAME)_include)) |
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
93 |
$1_GREP_INCLUDES:=| ( $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include \ |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
94 |
|| test "$$$$?" = "1" ) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
95 |
endif |
20363 | 96 |
endif |
97 |
ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES)) |
|
25854 | 98 |
$1_GREP_EXCLUDE_PATTERNS:=$$(call EscapeDollar, \ |
99 |
$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \ |
|
100 |
$$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))) |
|
20363 | 101 |
# If there are a lot of include patterns, output to file to shorten command lines |
102 |
ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),) |
|
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
103 |
$1_GREP_EXCLUDES:=| ( $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS)) \ |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
104 |
|| test "$$$$?" = "1" ) |
12801 | 105 |
else |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
106 |
$1_GREP_EXCLUDE_OUTPUT = \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
107 |
$$(eval $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS, \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
108 |
$$($1_BIN)/_the.$$($1_JARNAME)_exclude)) |
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
109 |
$1_GREP_EXCLUDES:=| ( $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude \ |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
110 |
|| test "$$$$?" = "1" ) |
12801 | 111 |
endif |
20363 | 112 |
endif |
113 |
||
114 |
# Check if this jar needs to have its index generated. |
|
115 |
ifneq (,$$($1_JARINDEX)) |
|
48069
a358ebcfacfb
8192771: Boot JDK jar tool used to construct the modular JAR for java.jnlp
erikj
parents:
47253
diff
changeset
|
116 |
$1_JARINDEX = (cd $$(dir $$@) && $$($1_JAR_CMD) -i $$(notdir $$@)) |
20363 | 117 |
else |
118 |
$1_JARINDEX = true |
|
119 |
endif |
|
120 |
# When this macro is run in the same makefile as the java compilation, dependencies are |
|
121 |
# transfered in make variables. When the macro is run in a different makefile than the |
|
122 |
# java compilation, the dependencies need to be found in the filesystem. |
|
32720
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32717
diff
changeset
|
123 |
$1_ORIG_DEPS := $$($1_DEPENDENCIES) |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
124 |
ifeq ($$($1_DEPENDENCIES), ) |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27592
diff
changeset
|
125 |
# Add all source roots to the find cache since we are likely going to run find |
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
126 |
# on these more than once. The cache will only be updated if necessary. |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
127 |
$$(eval $$(call FillCacheFind, $$($1_FIND_LIST))) |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
128 |
$1_DEPENDENCIES:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \ |
20363 | 129 |
$$(call CacheFind,$$($1_SRCS))) |
130 |
ifneq (,$$($1_GREP_INCLUDE_PATTERNS)) |
|
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
131 |
$1_DEPENDENCIES:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPENDENCIES)) |
12801 | 132 |
endif |
20363 | 133 |
ifneq (,$$($1_GREP_EXCLUDE_PATTERNS)) |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
134 |
$1_DEPENDENCIES:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPENDENCIES)) |
20363 | 135 |
endif |
25854 | 136 |
# Look for EXTRA_FILES in all SRCS dirs and as absolute paths. |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
137 |
$1_DEPENDENCIES+=$$(wildcard $$(foreach src, $$($1_SRCS), \ |
25854 | 138 |
$$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES)) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
139 |
ifeq (,$$($1_SKIP_METAINF)) |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
140 |
$1_DEPENDENCIES+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS)))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
141 |
endif |
20363 | 142 |
endif |
23169
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
143 |
# The dependency list should never be empty |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
144 |
ifeq ($$(strip $$($1_DEPENDENCIES)), ) |
23169
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
145 |
$$(warning No dependencies found for $1) |
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
146 |
endif |
20363 | 147 |
|
148 |
# Utility macros, to make the shell script receipt somewhat easier to decipher. |
|
12801 | 149 |
|
25854 | 150 |
# Capture extra files is the same for both CAPTURE_CONTENTS and SCAPTURE_CONTENTS so |
151 |
# only define it once to avoid duplication. |
|
152 |
# The list of extra files might be long, so need to use ListPathsSafely to print |
|
153 |
# them out to a separte file. Then process the contents of that file to rewrite |
|
154 |
# into -C <dir> <file> lines. |
|
155 |
# The EXTRA_FILES_RESOLVED varible must be set in the macro so that it's evaluated |
|
156 |
# in the recipe when the files are guaranteed to exist. |
|
157 |
$1_CAPTURE_EXTRA_FILES=\ |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
158 |
$$(eval $1_EXTRA_FILES_RESOLVED:=$$(call DoubleDollar, \ |
25854 | 159 |
$$(wildcard $$(foreach src, $$($1_SRCS), \ |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
160 |
$$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES)))) \ |
25854 | 161 |
$$(if $$($1_EXTRA_FILES_RESOLVED), \ |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
162 |
$$(eval $$(call ListPathsSafely,$1_EXTRA_FILES_RESOLVED, \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
163 |
$$($1_BIN)/_the.$$($1_JARNAME)_contents.extra)) \ |
25854 | 164 |
$(SED) $$(foreach src,$$($1_SRCS), -e 's|$$(src)/|-C $$(src) |g') \ |
165 |
$$($1_BIN)/_the.$$($1_JARNAME)_contents.extra \ |
|
166 |
>> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) |
|
167 |
||
20363 | 168 |
# The capture contents macro finds all files (matching the patterns, typically |
169 |
# .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar. |
|
22467 | 170 |
# NOTICE: please leave the parentheses space separated otherwise the AIX build will break! |
25854 | 171 |
$1_CAPTURE_CONTENTS=\ |
172 |
$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \ |
|
173 |
$$(foreach src,$$($1_SRCS), \ |
|
174 |
$(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \ |
|
175 |
$$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \ |
|
176 |
>> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \ |
|
177 |
$$($1_CAPTURE_EXTRA_FILES) |
|
178 |
||
20363 | 179 |
# The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file. |
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
180 |
# Find returns non zero if the META-INF dir does not exist, ignore this. |
20363 | 181 |
ifeq (,$$($1_SKIP_METAINF)) |
25854 | 182 |
$1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS), \ |
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
183 |
( ( $(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null || true ) \ |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
184 |
| $(SED) 's|$$(src)/|-C $$(src) |g' >> \ |
25854 | 185 |
$$($1_BIN)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE) ) |
20363 | 186 |
endif |
187 |
# The capture deletes macro finds all deleted files and concatenates them. The resulting file |
|
188 |
# tells us what to remove from the jar-file. |
|
25854 | 189 |
$1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ \ |
190 |
-exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE)) |
|
20363 | 191 |
# The update contents macro updates the jar file with the previously capture contents. |
22467 | 192 |
# Use 'wc -w' to see if the contents file is empty. |
25854 | 193 |
$1_UPDATE_CONTENTS=\ |
194 |
if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \ |
|
195 |
$(ECHO) " updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \ |
|
48069
a358ebcfacfb
8192771: Boot JDK jar tool used to construct the modular JAR for java.jnlp
erikj
parents:
47253
diff
changeset
|
196 |
$$($1_JAR_CMD) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents; \ |
25854 | 197 |
fi $$(NEWLINE) |
20363 | 198 |
# The s-variants of the above macros are used when the jar is created from scratch. |
22467 | 199 |
# NOTICE: please leave the parentheses space separated otherwise the AIX build will break! |
25854 | 200 |
$1_SCAPTURE_CONTENTS=\ |
201 |
$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \ |
|
202 |
$$(foreach src,$$($1_SRCS), \ |
|
203 |
$(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \ |
|
204 |
$$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \ |
|
205 |
>> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \ |
|
206 |
$$($1_CAPTURE_EXTRA_FILES) |
|
13132 | 207 |
|
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
208 |
# Find returns non zero if the META-INF dir does not exist, ignore this. |
20363 | 209 |
ifeq (,$$($1_SKIP_METAINF)) |
210 |
$1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \ |
|
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
211 |
( ( $(FIND) $$(src)/META-INF -type f 2> /dev/null || true ) \ |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
212 |
| $(SED) 's|$$(src)/|-C $$(src) |g' >> \ |
25854 | 213 |
$$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) ) |
20363 | 214 |
endif |
48069
a358ebcfacfb
8192771: Boot JDK jar tool used to construct the modular JAR for java.jnlp
erikj
parents:
47253
diff
changeset
|
215 |
$1_SUPDATE_CONTENTS=$$($1_JAR_CMD) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) |
20363 | 216 |
|
217 |
# Use a slightly shorter name for logging, but with enough path to identify this jar. |
|
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
42136
diff
changeset
|
218 |
$1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_JAR)) |
20363 | 219 |
|
220 |
ifneq (,$$($1_CHECK_COMPRESS_JAR)) |
|
221 |
$1_JAR_CREATE_OPTIONS := c0fm |
|
222 |
$1_JAR_UPDATE_OPTIONS := u0f |
|
223 |
ifeq ($(COMPRESS_JARS), true) |
|
224 |
$1_JAR_CREATE_OPTIONS := cfm |
|
225 |
$1_JAR_UPDATE_OPTIONS := uf |
|
13132 | 226 |
endif |
20363 | 227 |
else |
228 |
$1_JAR_CREATE_OPTIONS := cfm |
|
229 |
$1_JAR_UPDATE_OPTIONS := uf |
|
230 |
endif |
|
13132 | 231 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
232 |
# Include all variables of significance in the vardeps file |
48069
a358ebcfacfb
8192771: Boot JDK jar tool used to construct the modular JAR for java.jnlp
erikj
parents:
47253
diff
changeset
|
233 |
$1_VARDEPS := $$($1_JAR_CMD) $$($1_JAR_CREATE_OPTIONS) $$($1_MANIFEST) \ |
32720
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32717
diff
changeset
|
234 |
$$($1_JARMAIN) $$($1_EXTRA_MANIFEST_ATTR) $$($1_ORIG_DEPS) $$($1_SRCS) \ |
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32717
diff
changeset
|
235 |
$$($1_INCLUDES) $$($1_EXCLUDES) $$($1_EXCLUDE_FILES) $$($1_EXTRA_FILES) |
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52065
diff
changeset
|
236 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_BIN)/_the.$$($1_JARNAME).vardeps) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
237 |
|
20363 | 238 |
# Here is the rule that creates/updates the jar file. |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
239 |
$$($1_JAR) : $$($1_DEPENDENCIES) $$($1_MANIFEST) $$($1_VARDEPS_FILE) |
52065
dea8a62cdfc3
8211724: Change mkdir -p to MakeDir macro where possible
erikj
parents:
48069
diff
changeset
|
240 |
$$(call MakeTargetDir) |
52595
16609197022c
8061281: Microbenchmark suite build support, directory layout and sample benchmarks
redestad
parents:
52065
diff
changeset
|
241 |
$$(call MakeDir, $$($1_BIN)) |
15051
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14613
diff
changeset
|
242 |
$$($1_GREP_INCLUDE_OUTPUT) |
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14613
diff
changeset
|
243 |
$$($1_GREP_EXCLUDE_OUTPUT) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
244 |
# If the vardeps file is part of the newer prereq list, it means that |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
245 |
# either the jar file does not exist, or we need to recreate it from |
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
246 |
# from scratch anyway since a simple update will not catch all the |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
247 |
# potential changes. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
248 |
$$(if $$(filter $$($1_VARDEPS_FILE) $$($1_MANIFEST), $$?), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
249 |
$$(if $$($1_MANIFEST), \ |
41460
4d20b8cc49d4
8158181: Stop adding missing newline to manifest files
ihse
parents:
33438
diff
changeset
|
250 |
$(CP) $$($1_MANIFEST) $$($1_MANIFEST_FILE) $$(NEWLINE) \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
251 |
, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
252 |
$(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE) $$(NEWLINE)) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
253 |
$$(if $$($1_JARMAIN), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
254 |
$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
255 |
$$(if $$($1_EXTRA_MANIFEST_ATTR), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
256 |
$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
257 |
$(ECHO) Creating $$($1_NAME) $$(NEWLINE) \ |
48069
a358ebcfacfb
8192771: Boot JDK jar tool used to construct the modular JAR for java.jnlp
erikj
parents:
47253
diff
changeset
|
258 |
$$($1_JAR_CMD) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
259 |
$$($1_SCAPTURE_CONTENTS) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
260 |
$$($1_SCAPTURE_METAINF) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
261 |
$$($1_SUPDATE_CONTENTS) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
262 |
$$($1_JARINDEX) && true \ |
20363 | 263 |
, \ |
264 |
$(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \ |
|
265 |
$$($1_CAPTURE_CONTENTS) \ |
|
266 |
$$($1_CAPTURE_METAINF) \ |
|
267 |
$(RM) $$($1_DELETES_FILE) $$(NEWLINE) \ |
|
268 |
$$($1_CAPTURE_DELETES) \ |
|
269 |
$(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \ |
|
270 |
if [ -s $$($1_DELETESS_FILE) ]; then \ |
|
271 |
$(ECHO) " deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \ |
|
42136
f872c8278074
8168037: Use ZIPEXE instead of ZIP to avoid clash with options for zip
ihse
parents:
41460
diff
changeset
|
272 |
$(ZIPEXE) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \ |
20363 | 273 |
fi $$(NEWLINE) \ |
274 |
$$($1_UPDATE_CONTENTS) true $$(NEWLINE) \ |
|
275 |
$$($1_JARINDEX) && true ) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
276 |
|
22480
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
277 |
# Add jar to target list |
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
278 |
$1 += $$($1_JAR) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
279 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
280 |
|
33438 | 281 |
endif # _JAR_ARCHIVE_GMK |