author | mockner |
Thu, 24 Sep 2015 11:26:30 -0400 | |
changeset 33099 | 55ad1d5370f6 |
parent 32460 | 9e9bffb3029a |
child 32717 | 3dfcb41a7326 |
permissions | -rw-r--r-- |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
30534
5e259b665bbf
8080630: Stop doing sed manipulation of manifest files in SetupJavaCompilation
ihse
parents:
30095
diff
changeset
|
2 |
# Copyright (c) 2011, 2015, 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 |
|
13697 | 26 |
# This makefile is much simpler now that it can use the smart javac wrapper |
27 |
# for dependency tracking between java packages and incremental compiles. |
|
28 |
# It could be even more simple if we added support for incremental jar updates |
|
29 |
# directly from the smart javac wrapper. |
|
30 |
||
31 |
# Cleaning/copying properties here is not a good solution. The properties |
|
32 |
# should be cleaned/copied by a annotation processor in sjavac. |
|
33 |
||
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
34 |
# When you read this source. Remember that $(sort ...) has the side effect |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
35 |
# of removing duplicates. It is actually this side effect that is |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
36 |
# desired whenever sort is used below! |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
37 |
|
25854 | 38 |
ifndef _JAVA_COMPILATION_GMK |
39 |
_JAVA_COMPILATION_GMK := 1 |
|
40 |
||
20363 | 41 |
ifeq (,$(_MAKEBASE_GMK)) |
42 |
$(error You must include MakeBase.gmk prior to including JavaCompilation.gmk) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
43 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
44 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
45 |
# Java compilation needs SetupZipArchive if we're generating a source zip. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
46 |
include ZipArchive.gmk |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
47 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
48 |
FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
49 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
50 |
# Setup make rules for defining a Java compiler, which is needed to compile |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
51 |
# Java code. This rule generates no output. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
52 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
53 |
# Parameter 1 is the name of the compiler definition. This name needs to be |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
54 |
# passed to SetupJavaCompilation. This name is used as variable prefix. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
55 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
56 |
# Remaining parameters are named arguments. These include: |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
57 |
# JVM:=The jvm used to run the javac/javah command |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
58 |
# JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
59 |
# FLAGS:=Flags to be supplied to javac |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
60 |
# SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
61 |
# SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above. |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
62 |
SetupJavaCompiler = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
63 |
define SetupJavaCompilerBody |
20363 | 64 |
# The port file contains the tcp/ip on which the server listens |
65 |
# and the cookie necessary to talk to the server. |
|
66 |
$1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port |
|
67 |
# You can use a different JVM to run the background javac server. |
|
68 |
ifeq ($$($1_SERVER_JVM),) |
|
69 |
# It defaults to the same JVM that is used to start the javac command. |
|
70 |
$1_SERVER_JVM:=$$($1_JVM) |
|
71 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
72 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
73 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
74 |
# Setup make rules for creating a jar archive. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
75 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
76 |
# 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
|
77 |
# 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
|
78 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
79 |
# Remaining parameters are named arguments. These include: |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
80 |
# DEPENDENCIES:=List of dependencies for the jar target. If left empty, |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
81 |
# dependencies are calculated automatically from the source files found. |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
82 |
# 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
|
83 |
# parsed. |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
84 |
# SRCS:=List of directories in where to find files to add to archive |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
85 |
# SUFFIXES:=File suffixes to include in jar |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
86 |
# INCLUDES:=List of directories/packages in SRCS that should be included |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
87 |
# EXCLUDES:=List of directories/packages in SRCS that should be excluded |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
88 |
# EXCLUDE_FILES:=List of files in SRCS that should be excluded |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
89 |
# 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
|
90 |
# JAR:=Jar file to create |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
91 |
# MANIFEST:=Optional manifest file template. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
92 |
# JARMAIN:=Optional main class to add to manifest |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
93 |
# JARINDEX:=true means generate the index in the jar file. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
94 |
# 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
|
95 |
# added to the archive. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
96 |
# EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
97 |
# CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
98 |
SetupArchive = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
99 |
define SetupArchiveBody |
14111 | 100 |
|
20363 | 101 |
$1_JARMAIN:=$(strip $$($1_JARMAIN)) |
102 |
$1_JARNAME:=$$(notdir $$($1_JAR)) |
|
103 |
$1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest |
|
104 |
$1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess |
|
105 |
$1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes |
|
106 |
$1_BIN:=$$(dir $$($1_JAR)) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
107 |
|
20363 | 108 |
ifeq (,$$($1_SUFFIXES)) |
109 |
# No suffix was set, default to classes. |
|
110 |
$1_SUFFIXES:=.class |
|
111 |
endif |
|
112 |
# Convert suffixes to a find expression |
|
113 |
$1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES)) |
|
114 |
# On windows, a lot of includes/excludes risk making the command line too long, so |
|
115 |
# 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
|
116 |
# Grep returns 1 if nothing is matched. Do not fail the build for this. |
20363 | 117 |
ifneq (,$$($1_INCLUDES)) |
25854 | 118 |
$1_GREP_INCLUDE_PATTERNS:=$$(call EscapeDollar, \ |
119 |
$$(foreach src,$$($1_SRCS), $$(addprefix $$(src)/,$$($1_INCLUDES)))) |
|
20363 | 120 |
# If there are a lot of include patterns, output to file to shorten command lines |
121 |
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
|
122 |
$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
|
123 |
|| test "$$$$?" = "1" ) |
20363 | 124 |
else |
20364 | 125 |
$1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \ |
126 |
$$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \ |
|
127 |
>> $$($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
|
128 |
$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
|
129 |
|| test "$$$$?" = "1" ) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
130 |
endif |
20363 | 131 |
endif |
132 |
ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES)) |
|
25854 | 133 |
$1_GREP_EXCLUDE_PATTERNS:=$$(call EscapeDollar, \ |
134 |
$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \ |
|
135 |
$$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))) |
|
20363 | 136 |
# If there are a lot of include patterns, output to file to shorten command lines |
137 |
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
|
138 |
$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
|
139 |
|| test "$$$$?" = "1" ) |
12801 | 140 |
else |
20364 | 141 |
$1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \ |
142 |
$$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \ |
|
143 |
>> $$($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
|
144 |
$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
|
145 |
|| test "$$$$?" = "1" ) |
12801 | 146 |
endif |
20363 | 147 |
endif |
148 |
||
149 |
# Check if this jar needs to have its index generated. |
|
150 |
ifneq (,$$($1_JARINDEX)) |
|
151 |
$1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@)) |
|
152 |
else |
|
153 |
$1_JARINDEX = true |
|
154 |
endif |
|
155 |
# When this macro is run in the same makefile as the java compilation, dependencies are |
|
156 |
# transfered in make variables. When the macro is run in a different makefile than the |
|
157 |
# java compilation, the dependencies need to be found in the filesystem. |
|
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
158 |
ifeq ($$($1_DEPENDENCIES), ) |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27592
diff
changeset
|
159 |
# 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
|
160 |
# 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
|
161 |
$$(eval $$(call FillCacheFind, $$($1_FIND_LIST))) |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
162 |
$1_DEPENDENCIES:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \ |
20363 | 163 |
$$(call CacheFind,$$($1_SRCS))) |
164 |
ifneq (,$$($1_GREP_INCLUDE_PATTERNS)) |
|
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
165 |
$1_DEPENDENCIES:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPENDENCIES)) |
12801 | 166 |
endif |
20363 | 167 |
ifneq (,$$($1_GREP_EXCLUDE_PATTERNS)) |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
168 |
$1_DEPENDENCIES:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPENDENCIES)) |
20363 | 169 |
endif |
25854 | 170 |
# 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
|
171 |
$1_DEPENDENCIES+=$$(wildcard $$(foreach src, $$($1_SRCS), \ |
25854 | 172 |
$$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES)) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
173 |
ifeq (,$$($1_SKIP_METAINF)) |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
174 |
$1_DEPENDENCIES+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS)))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
175 |
endif |
20363 | 176 |
endif |
23169
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
177 |
# The dependency list should never be empty |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
178 |
ifeq ($$(strip $$($1_DEPENDENCIES)), ) |
23169
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
179 |
$$(warning No dependencies found for $1) |
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
180 |
endif |
20363 | 181 |
|
182 |
# Utility macros, to make the shell script receipt somewhat easier to decipher. |
|
12801 | 183 |
|
25854 | 184 |
# Capture extra files is the same for both CAPTURE_CONTENTS and SCAPTURE_CONTENTS so |
185 |
# only define it once to avoid duplication. |
|
186 |
# The list of extra files might be long, so need to use ListPathsSafely to print |
|
187 |
# them out to a separte file. Then process the contents of that file to rewrite |
|
188 |
# into -C <dir> <file> lines. |
|
189 |
# The EXTRA_FILES_RESOLVED varible must be set in the macro so that it's evaluated |
|
190 |
# in the recipe when the files are guaranteed to exist. |
|
191 |
$1_CAPTURE_EXTRA_FILES=\ |
|
192 |
$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra $$(NEWLINE) \ |
|
193 |
$$(eval $1_EXTRA_FILES_RESOLVED:=$$(call DoubleDollar, $$(call DoubleDollar, \ |
|
194 |
$$(wildcard $$(foreach src, $$($1_SRCS), \ |
|
195 |
$$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES))))) \ |
|
196 |
$$(if $$($1_EXTRA_FILES_RESOLVED), \ |
|
197 |
$$(call ListPathsSafely,$1_EXTRA_FILES_RESOLVED,\n, \ |
|
198 |
>> $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra) $$(NEWLINE) \ |
|
199 |
$(SED) $$(foreach src,$$($1_SRCS), -e 's|$$(src)/|-C $$(src) |g') \ |
|
200 |
$$($1_BIN)/_the.$$($1_JARNAME)_contents.extra \ |
|
201 |
>> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) |
|
202 |
||
20363 | 203 |
# The capture contents macro finds all files (matching the patterns, typically |
204 |
# .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar. |
|
22467 | 205 |
# NOTICE: please leave the parentheses space separated otherwise the AIX build will break! |
25854 | 206 |
$1_CAPTURE_CONTENTS=\ |
207 |
$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \ |
|
208 |
$$(foreach src,$$($1_SRCS), \ |
|
209 |
$(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \ |
|
210 |
$$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \ |
|
211 |
>> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \ |
|
212 |
$$($1_CAPTURE_EXTRA_FILES) |
|
213 |
||
20363 | 214 |
# 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
|
215 |
# Find returns non zero if the META-INF dir does not exist, ignore this. |
20363 | 216 |
ifeq (,$$($1_SKIP_METAINF)) |
25854 | 217 |
$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
|
218 |
( ( $(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
|
219 |
| $(SED) 's|$$(src)/|-C $$(src) |g' >> \ |
25854 | 220 |
$$($1_BIN)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE) ) |
20363 | 221 |
endif |
222 |
# The capture deletes macro finds all deleted files and concatenates them. The resulting file |
|
223 |
# tells us what to remove from the jar-file. |
|
25854 | 224 |
$1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ \ |
225 |
-exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE)) |
|
20363 | 226 |
# The update contents macro updates the jar file with the previously capture contents. |
22467 | 227 |
# Use 'wc -w' to see if the contents file is empty. |
25854 | 228 |
$1_UPDATE_CONTENTS=\ |
229 |
if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \ |
|
230 |
$(ECHO) " updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \ |
|
231 |
$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents; \ |
|
232 |
fi $$(NEWLINE) |
|
20363 | 233 |
# The s-variants of the above macros are used when the jar is created from scratch. |
22467 | 234 |
# NOTICE: please leave the parentheses space separated otherwise the AIX build will break! |
25854 | 235 |
$1_SCAPTURE_CONTENTS=\ |
236 |
$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \ |
|
237 |
$$(foreach src,$$($1_SRCS), \ |
|
238 |
$(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \ |
|
239 |
$$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \ |
|
240 |
>> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \ |
|
241 |
$$($1_CAPTURE_EXTRA_FILES) |
|
13132 | 242 |
|
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27866
diff
changeset
|
243 |
# Find returns non zero if the META-INF dir does not exist, ignore this. |
20363 | 244 |
ifeq (,$$($1_SKIP_METAINF)) |
245 |
$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
|
246 |
( ( $(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
|
247 |
| $(SED) 's|$$(src)/|-C $$(src) |g' >> \ |
25854 | 248 |
$$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) ) |
20363 | 249 |
endif |
25854 | 250 |
$1_SUPDATE_CONTENTS=$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) |
20363 | 251 |
|
252 |
# Use a slightly shorter name for logging, but with enough path to identify this jar. |
|
253 |
$1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR)) |
|
254 |
||
255 |
ifneq (,$$($1_CHECK_COMPRESS_JAR)) |
|
256 |
$1_JAR_CREATE_OPTIONS := c0fm |
|
257 |
$1_JAR_UPDATE_OPTIONS := u0f |
|
258 |
ifeq ($(COMPRESS_JARS), true) |
|
259 |
$1_JAR_CREATE_OPTIONS := cfm |
|
260 |
$1_JAR_UPDATE_OPTIONS := uf |
|
13132 | 261 |
endif |
20363 | 262 |
else |
263 |
$1_JAR_CREATE_OPTIONS := cfm |
|
264 |
$1_JAR_UPDATE_OPTIONS := uf |
|
265 |
endif |
|
13132 | 266 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
267 |
# Include all variables of significance in the vardeps file |
30534
5e259b665bbf
8080630: Stop doing sed manipulation of manifest files in SetupJavaCompilation
ihse
parents:
30095
diff
changeset
|
268 |
$1_VARDEPS := $(JAR) $$($1_JAR_CREATE_OPTIONS) $$($1_MANIFEST) \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
269 |
$$($1_JARMAIN) $$($1_EXTRA_MANIFEST_ATTR) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
270 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$(dir $$($1_JAR))_the.$$($1_JARNAME).vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
271 |
|
20363 | 272 |
# Here is the rule that creates/updates the jar file. |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
273 |
$$($1_JAR) : $$($1_DEPENDENCIES) $$($1_MANIFEST) $$($1_VARDEPS_FILE) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
274 |
$(MKDIR) -p $$($1_BIN) |
15051
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14613
diff
changeset
|
275 |
$$($1_GREP_INCLUDE_OUTPUT) |
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14613
diff
changeset
|
276 |
$$($1_GREP_EXCLUDE_OUTPUT) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
277 |
# 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
|
278 |
# 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
|
279 |
# 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
|
280 |
# potential changes. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
281 |
$$(if $$(filter $$($1_VARDEPS_FILE) $$($1_MANIFEST), $$?), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
282 |
$$(if $$($1_MANIFEST), \ |
30534
5e259b665bbf
8080630: Stop doing sed manipulation of manifest files in SetupJavaCompilation
ihse
parents:
30095
diff
changeset
|
283 |
$(CP) $$($1_MANIFEST) $$($1_MANIFEST_FILE) $$(NEWLINE) \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
284 |
, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
285 |
$(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE) $$(NEWLINE)) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
286 |
$$(if $$($1_JARMAIN), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
287 |
$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
288 |
$$(if $$($1_EXTRA_MANIFEST_ATTR), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
289 |
$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
290 |
$(ECHO) Creating $$($1_NAME) $$(NEWLINE) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
291 |
$(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
292 |
$$($1_SCAPTURE_CONTENTS) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
293 |
$$($1_SCAPTURE_METAINF) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
294 |
$$($1_SUPDATE_CONTENTS) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
295 |
$$($1_JARINDEX) && true \ |
20363 | 296 |
, \ |
297 |
$(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \ |
|
298 |
$$($1_CAPTURE_CONTENTS) \ |
|
299 |
$$($1_CAPTURE_METAINF) \ |
|
300 |
$(RM) $$($1_DELETES_FILE) $$(NEWLINE) \ |
|
301 |
$$($1_CAPTURE_DELETES) \ |
|
302 |
$(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \ |
|
303 |
if [ -s $$($1_DELETESS_FILE) ]; then \ |
|
304 |
$(ECHO) " deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \ |
|
305 |
$(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \ |
|
306 |
fi $$(NEWLINE) \ |
|
307 |
$$($1_UPDATE_CONTENTS) true $$(NEWLINE) \ |
|
308 |
$$($1_JARINDEX) && true ) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
309 |
|
22480
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
310 |
# Add jar to target list |
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
311 |
$1 += $$($1_JAR) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
312 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
313 |
|
29174
fe55607529c3
8074091: Remove dead code from merge mistake in JavaCompilation.gmk
erikj
parents:
28909
diff
changeset
|
314 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
315 |
define add_file_to_copy |
20363 | 316 |
# param 1 = BUILD_MYPACKAGE |
317 |
# parma 2 = The source file to copy. |
|
318 |
$2_TARGET:=$2 |
|
319 |
# Remove the source prefix. |
|
320 |
$$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET))) |
|
25854 | 321 |
# To allow for automatic overrides, do not create a rule for a target file that |
322 |
# already has one |
|
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
323 |
ifneq ($$($1_COPY_$$($2_TARGET)), 1) |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
324 |
$1_COPY_$$($2_TARGET) := 1 |
25854 | 325 |
# Now we can setup the depency that will trigger the copying. |
326 |
$$($1_BIN)$$($2_TARGET) : $2 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
327 |
$(MKDIR) -p $$(@D) |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
328 |
$(CP) $$< $$@ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
329 |
$(CHMOD) -f ug+w $$@ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
330 |
|
25854 | 331 |
# And do not forget this target |
332 |
$1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET) |
|
333 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
334 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
335 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
336 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
337 |
# This macro is used only for properties files that are to be |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
338 |
# copied over to the classes directory in cleaned form: |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
339 |
# Previously this was inconsistently done in different repositories. |
13697 | 340 |
# This is the new clean standard. Though it is to be superseded by |
341 |
# a standard annotation processor from with sjavac. |
|
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
342 |
# |
28900
dd0303e8c9ce
8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents:
28606
diff
changeset
|
343 |
# An empty echo ensures that the input to sed always ends with a newline. |
dd0303e8c9ce
8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents:
28606
diff
changeset
|
344 |
# Certain implementations (e.g. Solaris) will skip the last line without |
dd0303e8c9ce
8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents:
28606
diff
changeset
|
345 |
# it. |
dd0303e8c9ce
8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents:
28606
diff
changeset
|
346 |
# |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
347 |
# The sed expression does this: |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
348 |
# 1. Add a backslash before any :, = or ! that do not have a backslash already. |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27592
diff
changeset
|
349 |
# 2. Apply the file unicode2x.sed which does a whole bunch of \u00XX to \xXX |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
350 |
# conversions. |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
351 |
# 3. Delete all lines starting with #. |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
352 |
# 4. Delete empty lines. |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
353 |
# 5. Append lines ending with \ with the next line. |
24080
8bfff14321a9
8041265: jdk/bin/rmic -iiop failed on macosx-x86_64 with "Class sun.rmi.rmic.iiop.BatchEnvironmen not found"
erikj
parents:
23983
diff
changeset
|
354 |
# 6. Remove leading and trailing white space. Note that tabs must be explicit |
8bfff14321a9
8041265: jdk/bin/rmic -iiop failed on macosx-x86_64 with "Class sun.rmi.rmic.iiop.BatchEnvironmen not found"
erikj
parents:
23983
diff
changeset
|
355 |
# as sed on macosx does not understand '\t'. |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
356 |
# 7. Replace the first \= with just =. |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
357 |
# 8. Finally it's all sorted to create a stable output. |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27592
diff
changeset
|
358 |
# |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
359 |
# It is assumed that = is the character used for separating names and values. |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
360 |
define add_file_to_clean |
20363 | 361 |
# param 1 = BUILD_MYPACKAGE |
362 |
# parma 2 = The source file to copy and clean. |
|
363 |
$2_TARGET:=$2 |
|
364 |
# Remove the source prefix. |
|
365 |
$$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET))) |
|
366 |
# Now we can setup the depency that will trigger the copying. |
|
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
367 |
# To allow for automatic overrides, do not create a rule for a target file that |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
368 |
# already has one |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
369 |
ifneq ($$($1_CLEAN_$$($2_TARGET)), 1) |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
370 |
$1_CLEAN_$$($2_TARGET) := 1 |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
371 |
$$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET) : $2 |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
372 |
$(MKDIR) -p $$(@D) |
28900
dd0303e8c9ce
8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents:
28606
diff
changeset
|
373 |
export LC_ALL=C ; ( $(CAT) $$< && $(ECHO) "" ) \ |
27591
f8f4973d2329
8065138: Encodings.isRecognizedEnconding sometimes fails to recognize 'UTF8'
erikj
parents:
26671
diff
changeset
|
374 |
| $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \ |
29438
6166fd4a617f
8058470: [jconsole] VM Summary Tab is blank for JDK9's jconsole.
sla
parents:
28909
diff
changeset
|
375 |
-e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ ]*#.*/#/g' \ |
21759 | 376 |
| $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \ |
20363 | 377 |
| $(SED) -e '/^#/d' -e '/^$$$$/d' \ |
378 |
-e :a -e '/\\$$$$/N; s/\\\n//; ta' \ |
|
24080
8bfff14321a9
8041265: jdk/bin/rmic -iiop failed on macosx-x86_64 with "Class sun.rmi.rmic.iiop.BatchEnvironmen not found"
erikj
parents:
23983
diff
changeset
|
379 |
-e 's/^[ ]*//;s/[ ]*$$$$//' \ |
27591
f8f4973d2329
8065138: Encodings.isRecognizedEnconding sometimes fails to recognize 'UTF8'
erikj
parents:
26671
diff
changeset
|
380 |
-e 's/\\=/=/' \ |
f8f4973d2329
8065138: Encodings.isRecognizedEnconding sometimes fails to recognize 'UTF8'
erikj
parents:
26671
diff
changeset
|
381 |
| $(SORT) > $$@ |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
382 |
$(CHMOD) -f ug+w $$@ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
383 |
|
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
384 |
# And do not forget this target |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
385 |
$1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET) |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
386 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
387 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
388 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
389 |
define remove_string |
20363 | 390 |
$2 := $$(subst $1,,$$($2)) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
391 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
392 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
393 |
# Setup make rules for compiling Java source code to class files and/or a |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
394 |
# resulting jar file. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
395 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
396 |
# 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
|
397 |
# 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
|
398 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
399 |
# Remaining parameters are named arguments. These include: |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
400 |
# SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
401 |
# JVM:=path to ..bin/java |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
402 |
# ADD_JAVAC_FLAGS:=javac flags to append to the default ones. |
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
403 |
# SRC:=one or more directories to search for sources. The order of the source roots |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
404 |
# is significant. The first found file of a certain name has priority. |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
405 |
# BIN:=store classes here |
32460
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
406 |
# CLASSPATH:=a list of additional entries to set as classpath to javac |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
407 |
# INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
408 |
# EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
409 |
# COPY:=.prp means copy all prp files to the corresponding package in BIN. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
410 |
# COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
411 |
# CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
412 |
# CLEAN_FILES:=myapp/foo/setting.txt means clean this file over to the package myapp/foo |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
413 |
# SRCZIP:=Create a src.zip based on the found sources and copied files. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
414 |
# INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file! |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
415 |
# EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file! |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
416 |
# "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
417 |
# HEADERS:=path to directory where all generated c-headers are written. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
418 |
# DEPENDS:=Extra dependecy |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
419 |
# DISABLE_SJAVAC:=Explicitly disable the use of sjavac for this compilation unit. |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
420 |
SetupJavaCompilation = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
421 |
define SetupJavaCompilationBody |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
422 |
|
28902
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
27866
diff
changeset
|
423 |
# Verify arguments |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
27866
diff
changeset
|
424 |
ifeq ($$($1_BIN),) |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
27866
diff
changeset
|
425 |
$$(error Must specify BIN (in $1)) |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
27866
diff
changeset
|
426 |
endif |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
27866
diff
changeset
|
427 |
|
20363 | 428 |
# Extract the info from the java compiler setup. |
429 |
$1_JVM := $$($$($1_SETUP)_JVM) |
|
430 |
$1_JAVAC := $$($$($1_SETUP)_JAVAC) |
|
431 |
$1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS) |
|
32460
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
432 |
ifneq ($$($1_CLASSPATH), ) |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
433 |
$1_FLAGS += -cp $$(call PathList, $$($1_CLASSPATH)) |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
434 |
endif |
20363 | 435 |
ifeq ($$($1_JAVAC),) |
436 |
$$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP)) |
|
437 |
endif |
|
438 |
$1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE) |
|
439 |
$1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM) |
|
440 |
||
441 |
# Handle addons and overrides. |
|
442 |
$1_SRC:=$$(call ADD_SRCS,$$($1_SRC)) |
|
443 |
# Make sure the dirs exist. |
|
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
444 |
$$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory >$$d<))) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
445 |
$$(call MakeDir,$$($1_BIN)) |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27592
diff
changeset
|
446 |
# 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
|
447 |
# 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
|
448 |
$$(eval $$(call FillCacheFind,$$($1_SRC))) |
25854 | 449 |
# Find all files in the source trees. Preserve order of source roots for overrides to |
450 |
# work correctly. CacheFind does not preserve order so need to call it for each root. |
|
451 |
$1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(foreach s,$$($1_SRC),$$(call CacheFind,$$(s)))) |
|
20363 | 452 |
# Extract the java files. |
453 |
ifneq ($$($1_EXCLUDE_FILES),) |
|
454 |
$1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES)) |
|
455 |
endif |
|
456 |
$1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS))) |
|
457 |
ifneq ($$($1_INCLUDE_FILES),) |
|
458 |
$1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES))) |
|
459 |
$1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS)) |
|
460 |
endif |
|
461 |
||
462 |
# Prepend the source/bin path to the filter expressions. |
|
463 |
ifneq ($$($1_INCLUDES),) |
|
464 |
$1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES)))) |
|
465 |
$1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS)) |
|
466 |
endif |
|
467 |
ifneq ($$($1_EXCLUDES),) |
|
468 |
$1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) |
|
469 |
$1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS)) |
|
470 |
endif |
|
471 |
||
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
472 |
# Remove duplicate source files by keeping the first found of each duplicate. |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
473 |
# This allows for automatic overrides with custom or platform specific versions |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
474 |
# source files. |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
475 |
# |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
476 |
# For the smart javac wrapper case, add each removed file to an extra exclude |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
477 |
# file list to prevent sjavac from finding duplicate sources. |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
478 |
$1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
479 |
$$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
480 |
$$(if $$($1_$$(relative_src)), \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
481 |
$$(eval $1_SJAVAC_EXCLUDE_FILES += $$(s)), \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
482 |
$$(eval $1_$$(relative_src) := 1) $$(s)))) |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
483 |
|
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
484 |
# Create the corresponding smart javac wrapper command line. |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
485 |
$1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix /*,$$($1_EXCLUDES))) \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
486 |
$$(addprefix -i ,$$(addsuffix /*,$$($1_INCLUDES))) \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
487 |
$$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES) $$($1_SJAVAC_EXCLUDE_FILES))) \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
488 |
$$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \ |
32460
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
489 |
-src $$(call PathList, $$($1_SRC)) |
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29442
diff
changeset
|
490 |
|
25854 | 491 |
# All files below META-INF are always copied. |
492 |
$1_ALL_COPIES := $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS)) |
|
20363 | 493 |
# Find all files to be copied from source to bin. |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
494 |
ifneq (,$$($1_COPY)$$($1_COPY_FILES)) |
20363 | 495 |
# Search for all files to be copied. |
25854 | 496 |
$1_ALL_COPIES += $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS)) |
20363 | 497 |
# Copy these explicitly |
498 |
$1_ALL_COPIES += $$($1_COPY_FILES) |
|
28601
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
499 |
endif |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
500 |
# Copy must also respect filters. |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
501 |
ifneq (,$$($1_INCLUDES)) |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
502 |
$1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES)) |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
503 |
endif |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
504 |
ifneq (,$$($1_EXCLUDES)) |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
505 |
$1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES)) |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
506 |
endif |
28601
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
507 |
ifneq (,$$($1_EXCLUDE_FILES)) |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
508 |
$1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES)) |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
509 |
endif |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
510 |
ifneq (,$$($1_ALL_COPIES)) |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
511 |
# Yep, there are files to be copied! |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
512 |
$1_ALL_COPY_TARGETS:= |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
513 |
$$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i))) |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
514 |
# Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files! |
de178dea78cd
8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents:
28600
diff
changeset
|
515 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
516 |
|
20363 | 517 |
# Find all property files to be copied and cleaned from source to bin. |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
518 |
ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES)) |
20363 | 519 |
# Search for all files to be copied. |
520 |
$1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS)) |
|
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
521 |
# Clean these explicitly |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
522 |
$1_ALL_CLEANS += $$($1_CLEAN_FILES) |
20363 | 523 |
# Copy and clean must also respect filters. |
524 |
ifneq (,$$($1_INCLUDES)) |
|
525 |
$1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS)) |
|
526 |
endif |
|
527 |
ifneq (,$$($1_EXCLUDES)) |
|
528 |
$1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS)) |
|
529 |
endif |
|
530 |
ifneq (,$$($1_EXCLUDE_FILES)) |
|
531 |
$1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS)) |
|
532 |
endif |
|
533 |
ifneq (,$$($1_ALL_CLEANS)) |
|
534 |
# Yep, there are files to be copied and cleaned! |
|
535 |
$1_ALL_COPY_CLEAN_TARGETS:= |
|
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
536 |
$$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_clean,$1,$$i))) |
20363 | 537 |
# Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files! |
538 |
endif |
|
539 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
540 |
|
20363 | 541 |
# Create a sed expression to remove the source roots and to replace / with . |
542 |
# and remove .java at the end. |
|
543 |
$1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g' |
|
544 |
||
545 |
ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes) |
|
546 |
ifneq (,$$($1_HEADERS)) |
|
547 |
$1_HEADERS_ARG := -h $$($1_HEADERS) |
|
13697 | 548 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
549 |
|
20363 | 550 |
# Using sjavac to compile. |
26129
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
551 |
$1_COMPILE_TARGETS := $$($1_BIN)/_the.$1_batch |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
552 |
|
20363 | 553 |
# Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be |
554 |
# "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main" |
|
555 |
# and javac is simply replaced with sjavac. |
|
556 |
$1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC)) |
|
557 |
||
558 |
# Set the $1_REMOTE to spawn a background javac server. |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
559 |
$1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
560 |
$$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC)))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
561 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
562 |
$1_VARDEPS := $$($1_JVM) $$($1_SJAVAC) $$($1_SJAVAC_ARGS) $$($1_FLAGS) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
563 |
$$($1_HEADERS_ARG) $$($1_BIN) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
564 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_BIN)/_the.$1.vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
565 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
566 |
$$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE) |
28360 | 567 |
$(MKDIR) -p $$(@D) $$(dir $$($1_SJAVAC_PORTFILE)) |
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
568 |
$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp) |
20363 | 569 |
$(ECHO) Compiling $1 |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
570 |
$(call LogFailures, $$($1_BIN)/_the.$1_batch.log, $1, \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
571 |
$$($1_JVM) $$($1_SJAVAC) \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
572 |
$$($1_REMOTE) \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
573 |
-j 1 \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
574 |
--permit-unidentified-artifacts \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
575 |
--permit-sources-without-package \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
576 |
--compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
577 |
--log=$(LOG_LEVEL) \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
578 |
$$($1_SJAVAC_ARGS) \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
579 |
$$($1_FLAGS) \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
580 |
$$($1_HEADERS_ARG) \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
581 |
-d $$($1_BIN)) && \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
582 |
$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch |
26129
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
583 |
# Create a pubapi file that only changes when the pubapi changes. Dependent |
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
584 |
# compilations can use this file to only get recompiled when pubapi has changed. |
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
585 |
# Grep returns 1 if no matching lines are found. Do not fail for this. |
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
586 |
$(GREP) -e "^I" $$($1_BIN)/javac_state > $$($1_BIN)/_the.$1_pubapi.tmp \ |
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
587 |
|| test "$$$$?" = "1" |
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
588 |
if [ ! -f $$($1_BIN)/_the.$1_pubapi ] \ |
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
589 |
|| [ "`$(DIFF) $$($1_BIN)/_the.$1_pubapi $$($1_BIN)/_the.$1_pubapi.tmp`" != "" ]; then \ |
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
590 |
$(MV) $$($1_BIN)/_the.$1_pubapi.tmp $$($1_BIN)/_the.$1_pubapi; \ |
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
591 |
fi |
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
592 |
|
20363 | 593 |
else |
594 |
# Using plain javac to batch compile everything. |
|
25854 | 595 |
$1_COMPILE_TARGETS := $$($1_BIN)/_the.$1_batch |
14111 | 596 |
|
20363 | 597 |
# When building in batch, put headers in a temp dir to filter out those that actually |
598 |
# changed before copying them to the real header dir. |
|
599 |
ifneq (,$$($1_HEADERS)) |
|
22481
e0f8e9039971
8033210: Intermittent build failure: jdk8 fails on win_i586 in jdk/make (p11_convert.c(67) : Cannot open 'sun_security_pkcs11_wrapper_PKCS11.h)
erikj
parents:
22480
diff
changeset
|
600 |
$1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
601 |
|
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
602 |
$$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch |
14111 | 603 |
$(MKDIR) -p $$(@D) |
25854 | 604 |
if [ -d "$$($1_HEADERS).$1.tmp" ]; then \ |
605 |
for f in `ls $$($1_HEADERS).$1.tmp`; do \ |
|
606 |
if [ ! -f "$$($1_HEADERS)/$$$$f" ] \ |
|
607 |
|| [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \ |
|
22481
e0f8e9039971
8033210: Intermittent build failure: jdk8 fails on win_i586 in jdk/make (p11_convert.c(67) : Cannot open 'sun_security_pkcs11_wrapper_PKCS11.h)
erikj
parents:
22480
diff
changeset
|
608 |
$(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \ |
14111 | 609 |
fi; \ |
25854 | 610 |
done; \ |
611 |
fi |
|
22481
e0f8e9039971
8033210: Intermittent build failure: jdk8 fails on win_i586 in jdk/make (p11_convert.c(67) : Cannot open 'sun_security_pkcs11_wrapper_PKCS11.h)
erikj
parents:
22480
diff
changeset
|
612 |
$(RM) -r $$($1_HEADERS).$1.tmp |
14111 | 613 |
$(TOUCH) $$@ |
614 |
||
25854 | 615 |
$1_HEADER_TARGETS := $$($1_HEADERS)/_the.$1_headers |
20363 | 616 |
endif |
14111 | 617 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
618 |
$1_VARDEPS := $$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) $$($1_BIN) $$($1_HEADERS_ARG) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
619 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_BIN)/_the.$1.vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
620 |
|
20363 | 621 |
# When not using sjavac, pass along all sources to javac using an @file. |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
622 |
$$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE) |
20363 | 623 |
$(MKDIR) -p $$(@D) |
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
624 |
$(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp |
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
625 |
$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp) |
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
626 |
$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1 |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
627 |
$(call LogFailures, $$($1_BIN)/_the.$1_batch.log, $1, \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
628 |
$$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
629 |
-implicit:none \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
630 |
-d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp) && \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31014
diff
changeset
|
631 |
$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch |
20363 | 632 |
endif |
633 |
||
25854 | 634 |
# Add all targets to main variable |
635 |
$1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_COMPILE_TARGETS) \ |
|
636 |
$$($1_HEADER_TARGETS) |
|
637 |
||
20363 | 638 |
# Check if a jar file was specified, then setup the rules for the jar. |
639 |
ifneq (,$$($1_JAR)) |
|
640 |
# If no suffixes was explicitly set for this jar file. |
|
641 |
# Use class and the cleaned/copied properties file suffixes as the default |
|
642 |
# for the types of files to be put into the jar. |
|
643 |
ifeq (,$$($1_SUFFIXES)) |
|
644 |
$1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
645 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
646 |
|
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
647 |
$$(eval $$(call SetupArchive,ARCHIVE_$1, \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29174
diff
changeset
|
648 |
DEPENDENCIES:=$$($1), \ |
20363 | 649 |
SRCS:=$$($1_BIN), \ |
650 |
SUFFIXES:=$$($1_SUFFIXES), \ |
|
651 |
EXCLUDE:=$$($1_EXCLUDES), \ |
|
652 |
INCLUDES:=$$($1_INCLUDES), \ |
|
653 |
EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \ |
|
654 |
JAR:=$$($1_JAR), \ |
|
655 |
JARMAIN:=$$($1_JARMAIN), \ |
|
656 |
MANIFEST:=$$($1_MANIFEST), \ |
|
657 |
EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \ |
|
658 |
JARINDEX:=$$($1_JARINDEX), \ |
|
659 |
HEADERS:=$$($1_HEADERS), \ |
|
660 |
SETUP:=$$($1_SETUP))) |
|
22480
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
661 |
|
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
662 |
# Add jar to target list |
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
663 |
$1 += $$($1_JAR) |
20363 | 664 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
665 |
|
20363 | 666 |
# Check if a srczip was specified, then setup the rules for the srczip. |
667 |
ifneq (,$$($1_SRCZIP)) |
|
668 |
$$(eval $$(call SetupZipArchive,ARCHIVE_$1, \ |
|
669 |
SRC:=$$($1_SRC), \ |
|
670 |
ZIP:=$$($1_SRCZIP), \ |
|
671 |
INCLUDES:=$$($1_INCLUDES), \ |
|
672 |
EXCLUDES:=$$($1_EXCLUDES), \ |
|
673 |
EXCLUDE_FILES:=$$($1_EXCLUDE_FILES))) |
|
22480
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
674 |
|
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
675 |
# Add zip to target list |
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
676 |
$1 += $$($1_SRCZIP) |
20363 | 677 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
678 |
endef |
25854 | 679 |
|
680 |
# Use this macro to find the correct target to depend on when the original |
|
681 |
# SetupJavaCompilation is declared in a different makefile, to avoid having |
|
682 |
# to declare and evaluate it again. |
|
683 |
# param 1 is for example BUILD_MYPACKAGE |
|
684 |
# param 2 is the output directory (BIN) |
|
685 |
define SetupJavaCompilationCompileTarget |
|
26129
5ca768410aba
8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents:
25854
diff
changeset
|
686 |
$(if $(findstring yes, $(ENABLE_SJAVAC)), $(strip $2)/_the.$(strip $1)_pubapi, \ |
25854 | 687 |
$(strip $2)/_the.$(strip $1)_batch) |
688 |
endef |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
689 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28360
diff
changeset
|
690 |
endif # _JAVA_COMPILATION_GMK |