author | ppunegov |
Sat, 19 Jul 2014 00:29:20 +0400 | |
changeset 25732 | e2c1d053a55f |
parent 24080 | 8bfff14321a9 |
child 25854 | 98ce0879ab4c |
permissions | -rw-r--r-- |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
20636
142c294d346e
6604021: RMIC is defaulting to BOOT jdk version, needs to be rmic.jar
erikj
parents:
20273
diff
changeset
|
2 |
# Copyright (c) 2011, 2013, 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 |
|
20363 | 38 |
ifeq (,$(_MAKEBASE_GMK)) |
39 |
$(error You must include MakeBase.gmk prior to including JavaCompilation.gmk) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
40 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
41 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
42 |
FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
43 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
44 |
define SetupJavaCompiler |
20363 | 45 |
# param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE |
46 |
# This is the name of the compiler setup. |
|
47 |
# param 2-9 are named args. |
|
48 |
# JVM:=The jvm used to run the javac/javah command |
|
49 |
# JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out |
|
50 |
# FLAGS:=Flags to be supplied to javac |
|
51 |
# SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here |
|
52 |
# SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above. |
|
53 |
$(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) |
|
54 |
$(call LogSetupMacroEntry,SetupJavaCompiler($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) |
|
55 |
$(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompiler, please update JavaCompilation.gmk)) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
56 |
|
20363 | 57 |
# The port file contains the tcp/ip on which the server listens |
58 |
# and the cookie necessary to talk to the server. |
|
59 |
$1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port |
|
60 |
# You can use a different JVM to run the background javac server. |
|
61 |
ifeq ($$($1_SERVER_JVM),) |
|
62 |
# It defaults to the same JVM that is used to start the javac command. |
|
63 |
$1_SERVER_JVM:=$$($1_JVM) |
|
64 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
65 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
66 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
67 |
define SetupArchive |
20363 | 68 |
# param 1 is for example ARCHIVE_MYPACKAGE |
69 |
# param 2 are the dependecies |
|
70 |
# param 3,4,5,6,7,8,9 are named args. |
|
71 |
# SRCS:=List of directories in where to find files to add to archive |
|
72 |
# SUFFIXES:=File suffixes to include in jar |
|
73 |
# INCLUDES:=List of directories/packages in SRCS that should be included |
|
74 |
# EXCLUDES:=List of directories/packages in SRCS that should be excluded |
|
75 |
# EXCLUDE_FILES:=List of files in SRCS that should be excluded |
|
76 |
# EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match. |
|
77 |
# JAR:=Jar file to create |
|
78 |
# MANIFEST:=Optional manifest file template. |
|
79 |
# JARMAIN:=Optional main class to add to manifest |
|
80 |
# JARINDEX:=true means generate the index in the jar file. |
|
81 |
# SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically |
|
82 |
# added to the archive. |
|
83 |
# EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest. |
|
84 |
# CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable |
|
85 |
||
86 |
# NOTE: $2 is dependencies, not a named argument! |
|
87 |
$(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) |
|
88 |
$(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) |
|
20364 | 89 |
$(if $(findstring $(LOG_LEVEL),trace), $(info *[2] <dependencies> = $(strip $2))) |
20363 | 90 |
$(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk)) |
14111 | 91 |
|
20363 | 92 |
$1_JARMAIN:=$(strip $$($1_JARMAIN)) |
93 |
$1_JARNAME:=$$(notdir $$($1_JAR)) |
|
94 |
$1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest |
|
95 |
$1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess |
|
96 |
$1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes |
|
97 |
$1_BIN:=$$(dir $$($1_JAR)) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
98 |
|
20363 | 99 |
ifeq (,$$($1_SUFFIXES)) |
100 |
# No suffix was set, default to classes. |
|
101 |
$1_SUFFIXES:=.class |
|
102 |
endif |
|
103 |
# Convert suffixes to a find expression |
|
104 |
$1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES)) |
|
105 |
# On windows, a lot of includes/excludes risk making the command line too long, so |
|
106 |
# writing the grep patterns to files. |
|
107 |
ifneq (,$$($1_INCLUDES)) |
|
108 |
$1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \ |
|
109 |
$$(addprefix $$(src)/,$$($1_INCLUDES))) |
|
110 |
# If there are a lot of include patterns, output to file to shorten command lines |
|
111 |
ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),) |
|
112 |
$1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS)) |
|
113 |
else |
|
20364 | 114 |
$1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \ |
115 |
$$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \ |
|
116 |
>> $$($1_BIN)/_the.$$($1_JARNAME)_include) |
|
20363 | 117 |
$1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
118 |
endif |
20363 | 119 |
endif |
120 |
ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES)) |
|
121 |
$1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \ |
|
122 |
$$($1_EXCLUDES) $$($1_EXCLUDE_FILES))) |
|
123 |
# If there are a lot of include patterns, output to file to shorten command lines |
|
124 |
ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),) |
|
125 |
$1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS)) |
|
12801 | 126 |
else |
20364 | 127 |
$1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \ |
128 |
$$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \ |
|
129 |
>> $$($1_BIN)/_the.$$($1_JARNAME)_exclude) |
|
20363 | 130 |
$1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude |
12801 | 131 |
endif |
20363 | 132 |
endif |
133 |
||
134 |
# Check if this jar needs to have its index generated. |
|
135 |
ifneq (,$$($1_JARINDEX)) |
|
136 |
$1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@)) |
|
137 |
else |
|
138 |
$1_JARINDEX = true |
|
139 |
endif |
|
140 |
# When this macro is run in the same makefile as the java compilation, dependencies are |
|
141 |
# transfered in make variables. When the macro is run in a different makefile than the |
|
142 |
# java compilation, the dependencies need to be found in the filesystem. |
|
143 |
ifneq (,$2) |
|
144 |
$1_DEPS:=$2 |
|
145 |
else |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
146 |
# Add all source roots to the find cache since we are likely going to run find |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
147 |
# 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
|
148 |
$$(eval $$(call FillCacheFind, $$($1_FIND_LIST))) |
20363 | 149 |
$1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \ |
150 |
$$(call CacheFind,$$($1_SRCS))) |
|
151 |
ifneq (,$$($1_GREP_INCLUDE_PATTERNS)) |
|
152 |
$1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS)) |
|
12801 | 153 |
endif |
20363 | 154 |
ifneq (,$$($1_GREP_EXCLUDE_PATTERNS)) |
155 |
$1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS)) |
|
156 |
endif |
|
157 |
# The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command |
|
158 |
# lines, but not here for use in make dependencies. |
|
159 |
$1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES)))) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
160 |
ifeq (,$$($1_SKIP_METAINF)) |
20363 | 161 |
$1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS)))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
162 |
endif |
20363 | 163 |
endif |
23169
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
164 |
# The dependency list should never be empty |
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
165 |
ifeq ($$(strip $$($1_DEPS)), ) |
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
166 |
$$(warning No dependencies found for $1) |
fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents:
23167
diff
changeset
|
167 |
endif |
20363 | 168 |
|
169 |
# Utility macros, to make the shell script receipt somewhat easier to decipher. |
|
12801 | 170 |
|
20363 | 171 |
# The capture contents macro finds all files (matching the patterns, typically |
172 |
# .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar. |
|
22467 | 173 |
# NOTICE: please leave the parentheses space separated otherwise the AIX build will break! |
20363 | 174 |
$1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \ |
22467 | 175 |
( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \ |
20363 | 176 |
$$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \ |
22467 | 177 |
$(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES) ) ) > \ |
178 |
$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) ) |
|
20363 | 179 |
# The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file. |
180 |
ifeq (,$$($1_SKIP_METAINF)) |
|
181 |
$1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE)) |
|
182 |
endif |
|
183 |
# The capture deletes macro finds all deleted files and concatenates them. The resulting file |
|
184 |
# tells us what to remove from the jar-file. |
|
185 |
$1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE)) |
|
186 |
# The update contents macro updates the jar file with the previously capture contents. |
|
22467 | 187 |
# Use 'wc -w' to see if the contents file is empty. |
20363 | 188 |
$1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \ |
189 |
(cd $$(src) && \ |
|
22467 | 190 |
if [ "`$(WC) -w _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \ |
20363 | 191 |
$(ECHO) " updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \ |
192 |
$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \ |
|
193 |
fi) $$(NEWLINE)) |
|
194 |
# The s-variants of the above macros are used when the jar is created from scratch. |
|
22467 | 195 |
# NOTICE: please leave the parentheses space separated otherwise the AIX build will break! |
20363 | 196 |
$1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \ |
22467 | 197 |
( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \ |
20363 | 198 |
$$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \ |
22467 | 199 |
$$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES) ) ) > \ |
200 |
$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) ) |
|
13132 | 201 |
|
20363 | 202 |
ifeq (,$$($1_SKIP_METAINF)) |
203 |
$1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \ |
|
204 |
($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \ |
|
205 |
$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE)) |
|
206 |
endif |
|
207 |
$1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \ |
|
208 |
(cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE)) |
|
209 |
||
210 |
# Use a slightly shorter name for logging, but with enough path to identify this jar. |
|
211 |
$1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR)) |
|
212 |
||
213 |
ifneq (,$$($1_CHECK_COMPRESS_JAR)) |
|
214 |
$1_JAR_CREATE_OPTIONS := c0fm |
|
215 |
$1_JAR_UPDATE_OPTIONS := u0f |
|
216 |
ifeq ($(COMPRESS_JARS), true) |
|
217 |
$1_JAR_CREATE_OPTIONS := cfm |
|
218 |
$1_JAR_UPDATE_OPTIONS := uf |
|
13132 | 219 |
endif |
20363 | 220 |
else |
221 |
$1_JAR_CREATE_OPTIONS := cfm |
|
222 |
$1_JAR_UPDATE_OPTIONS := uf |
|
223 |
endif |
|
13132 | 224 |
|
20363 | 225 |
# Here is the rule that creates/updates the jar file. |
226 |
$$($1_JAR) : $$($1_DEPS) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
227 |
$(MKDIR) -p $$($1_BIN) |
15051
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14613
diff
changeset
|
228 |
$$($1_GREP_INCLUDE_OUTPUT) |
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14613
diff
changeset
|
229 |
$$($1_GREP_EXCLUDE_OUTPUT) |
20363 | 230 |
$$(if $$($1_MANIFEST), \ |
231 |
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ |
|
232 |
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ |
|
233 |
, \ |
|
234 |
$(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE)) |
|
14111 | 235 |
$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE)) |
236 |
$$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE)) |
|
20363 | 237 |
$$(if $$(wildcard $$@), \ |
238 |
$(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \ |
|
239 |
$$($1_CAPTURE_CONTENTS) \ |
|
240 |
$$($1_CAPTURE_METAINF) \ |
|
241 |
$(RM) $$($1_DELETES_FILE) $$(NEWLINE) \ |
|
242 |
$$($1_CAPTURE_DELETES) \ |
|
243 |
$(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \ |
|
244 |
if [ -s $$($1_DELETESS_FILE) ]; then \ |
|
245 |
$(ECHO) " deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \ |
|
246 |
$(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \ |
|
247 |
fi $$(NEWLINE) \ |
|
248 |
$$($1_UPDATE_CONTENTS) true $$(NEWLINE) \ |
|
249 |
$$($1_JARINDEX) && true \ |
|
250 |
, \ |
|
251 |
$(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \ |
|
252 |
$$($1_SCAPTURE_CONTENTS) \ |
|
253 |
$$($1_SCAPTURE_METAINF) \ |
|
254 |
$$($1_SUPDATE_CONTENTS) \ |
|
255 |
$$($1_JARINDEX) && true ) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
256 |
|
22480
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
257 |
# Add jar to target list |
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
258 |
$1 += $$($1_JAR) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
259 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
260 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
261 |
define SetupZipArchive |
20363 | 262 |
# param 1 is for example ZIP_MYSOURCE |
263 |
# param 2,3,4,5,6,7,8,9 are named args. |
|
264 |
# SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS |
|
265 |
$(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) |
|
266 |
$(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) |
|
267 |
$(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk)) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
268 |
|
20363 | 269 |
# To avoid running find over too large sets of files, which causes make to crash |
270 |
# on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set |
|
271 |
# of directories to run find in, if available. |
|
272 |
ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),) |
|
273 |
$1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \ |
|
274 |
$$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES)))) |
|
275 |
else |
|
276 |
$1_FIND_LIST := $$($1_SRC) |
|
277 |
endif |
|
18422 | 278 |
|
20363 | 279 |
# Find all files in the source tree. |
20645
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
280 |
$1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST))) |
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
281 |
|
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
282 |
# Filter on suffixes if set |
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
283 |
ifneq ($$($1_SUFFIXES),) |
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
284 |
$1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS)) |
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
285 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
286 |
|
20363 | 287 |
ifneq ($$($1_INCLUDES),) |
288 |
ifneq ($$($1_SUFFIXES),) |
|
289 |
$1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \ |
|
290 |
$$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES)))) |
|
291 |
else |
|
292 |
$1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES))) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
293 |
endif |
20363 | 294 |
endif |
295 |
ifneq ($$($1_INCLUDE_FILES),) |
|
296 |
$1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES)) |
|
297 |
endif |
|
298 |
ifneq ($$($1_EXCLUDES),) |
|
299 |
$1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) |
|
300 |
$1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES))) |
|
301 |
$1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS)) |
|
302 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
303 |
|
20363 | 304 |
# Use a slightly shorter name for logging, but with enough path to identify this zip. |
305 |
$1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP)) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
306 |
|
20363 | 307 |
# Now $1_ALL_SRCS should contain all sources that are going to be put into the zip. |
308 |
# I.e. the zip -i and -x options should match the filtering done in the makefile. |
|
309 |
# Explicitly excluded files can be given with absolute path. The patsubst solution |
|
310 |
# isn't perfect but the likelyhood of an absolute path to match something in a src |
|
311 |
# dir is very small. |
|
312 |
# If zip has nothing to do, it returns 12 and would fail the build. Check for 12 |
|
313 |
# and only fail if it's not. |
|
314 |
$$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS) |
|
315 |
$(MKDIR) -p $$(@D) |
|
316 |
$(ECHO) Updating $$($1_NAME) |
|
317 |
$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true |
|
318 |
$(TOUCH) $$@ |
|
22480
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
319 |
|
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
320 |
# Add zip to target list |
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
321 |
$1 += $$($1_ZIP) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
322 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
323 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
324 |
define add_file_to_copy |
20363 | 325 |
# param 1 = BUILD_MYPACKAGE |
326 |
# parma 2 = The source file to copy. |
|
327 |
$2_TARGET:=$2 |
|
328 |
# Remove the source prefix. |
|
329 |
$$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET))) |
|
330 |
# Now we can setup the depency that will trigger the copying. |
|
331 |
$$($1_BIN)$$($2_TARGET) : $2 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
332 |
$(MKDIR) -p $$(@D) |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
333 |
$(CP) $$< $$@ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
334 |
$(CHMOD) -f ug+w $$@ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
335 |
|
20363 | 336 |
# And do not forget this target |
337 |
$1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
338 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
339 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
340 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
341 |
# This macro is used only for properties files that are to be |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
342 |
# copied over to the classes directory in cleaned form: |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
343 |
# Previously this was inconsistently done in different repositories. |
13697 | 344 |
# This is the new clean standard. Though it is to be superseded by |
345 |
# 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
|
346 |
# |
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. |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
349 |
# 2. Apply the file unicode2x.sed which does a whole bunch of \u00XX to \xXX |
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. |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
358 |
# |
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. |
|
367 |
$$($1_BIN)$$($2_TARGET) : $2 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
368 |
$(MKDIR) -p $$(@D) |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
369 |
$(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \ |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
370 |
-e 's/\([^\\]\)!/\1\\!/g' -e 's/#.*/#/g' \ |
21759 | 371 |
| $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \ |
20363 | 372 |
| $(SED) -e '/^#/d' -e '/^$$$$/d' \ |
373 |
-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
|
374 |
-e 's/^[ ]*//;s/[ ]*$$$$//' \ |
23167
9996c6e2c03a
8036965: 9-dev solaris builds failed: sort: can't read STDIN: Illegal byte sequence
erikj
parents:
23162
diff
changeset
|
375 |
-e 's/\\=/=/' | LC_ALL=C $(SORT) > $$@ |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
376 |
$(CHMOD) -f ug+w $$@ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
377 |
|
20363 | 378 |
# And do not forget this target |
379 |
$1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
380 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
381 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
382 |
define remove_string |
20363 | 383 |
$2 := $$(subst $1,,$$($2)) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
384 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
385 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
386 |
define replace_space_with_pathsep |
20363 | 387 |
$1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
388 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
389 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
390 |
define SetupJavaCompilation |
20363 | 391 |
# param 1 is for example BUILD_MYPACKAGE |
392 |
# param 2,3,4,5,6,7,8 are named args. |
|
393 |
# SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC |
|
394 |
# JVM:=path to ..bin/java |
|
395 |
# ADD_JAVAC_FLAGS:=javac flags to append to the default ones. |
|
396 |
# SRC:=one or more directories to search for sources |
|
397 |
# BIN:=store classes here |
|
398 |
# INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages. |
|
399 |
# EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages. |
|
400 |
# COPY:=.prp means copy all prp files to the corresponding package in BIN. |
|
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
401 |
# COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo |
20363 | 402 |
# CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN. |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
403 |
# CLEAN_FILES:=myapp/foo/setting.txt means clean this file over to the package myapp/foo |
20363 | 404 |
# SRCZIP:=Create a src.zip based on the found sources and copied files. |
405 |
# INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file! |
|
406 |
# EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file! |
|
407 |
# "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found. |
|
20636
142c294d346e
6604021: RMIC is defaulting to BOOT jdk version, needs to be rmic.jar
erikj
parents:
20273
diff
changeset
|
408 |
# JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete |
142c294d346e
6604021: RMIC is defaulting to BOOT jdk version, needs to be rmic.jar
erikj
parents:
20273
diff
changeset
|
409 |
# source roots from SRC. This is sometimes needed when compiling specific subsets of the source. |
20363 | 410 |
# HEADERS:=path to directory where all generated c-headers are written. |
411 |
# DEPENDS:=Extra dependecy |
|
412 |
$(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) |
|
413 |
$(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) |
|
414 |
$(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk)) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
415 |
|
20363 | 416 |
# Extract the info from the java compiler setup. |
417 |
$1_JVM := $$($$($1_SETUP)_JVM) |
|
418 |
$1_JAVAC := $$($$($1_SETUP)_JAVAC) |
|
419 |
$1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS) |
|
420 |
ifeq ($$($1_JAVAC),) |
|
421 |
$$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP)) |
|
422 |
endif |
|
423 |
$1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE) |
|
424 |
$1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM) |
|
425 |
||
426 |
# Handle addons and overrides. |
|
427 |
$1_SRC:=$$(call ADD_SRCS,$$($1_SRC)) |
|
428 |
# Make sure the dirs exist. |
|
429 |
$$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d))) |
|
430 |
$$(eval $$(call MakeDir,$$($1_BIN))) |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
431 |
# Add all source roots to the find cache since we are likely going to run find |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
432 |
# 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
|
433 |
$$(eval $$(call FillCacheFind,$$($1_SRC))) |
20363 | 434 |
# Find all files in the source trees. |
435 |
$1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC))) |
|
436 |
# Extract the java files. |
|
437 |
ifneq ($$($1_EXCLUDE_FILES),) |
|
438 |
$1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES)) |
|
439 |
endif |
|
440 |
$1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS))) |
|
441 |
ifneq ($$($1_INCLUDE_FILES),) |
|
442 |
$1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES))) |
|
443 |
$1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS)) |
|
444 |
endif |
|
445 |
||
446 |
# Now we have a list of all java files to compile: $$($1_SRCS) |
|
447 |
||
448 |
# Create the corresponding smart javac wrapper command line. |
|
23983
fa89aaeb38c2
8037085: The sjavac exclude option should accept valid directory identifiers
alundblad
parents:
23170
diff
changeset
|
449 |
$1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix /*,$$($1_EXCLUDES))) \ |
fa89aaeb38c2
8037085: The sjavac exclude option should accept valid directory identifiers
alundblad
parents:
23170
diff
changeset
|
450 |
$$(addprefix -i ,$$(addsuffix /*,$$($1_INCLUDES))) \ |
20363 | 451 |
$$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \ |
452 |
$$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \ |
|
453 |
-src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))" |
|
13697 | 454 |
|
20363 | 455 |
# Prepend the source/bin path to the filter expressions. |
456 |
ifneq ($$($1_INCLUDES),) |
|
457 |
$1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES)))) |
|
458 |
$1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS)) |
|
459 |
endif |
|
460 |
ifneq ($$($1_EXCLUDES),) |
|
461 |
$1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) |
|
462 |
$1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS)) |
|
463 |
endif |
|
464 |
||
465 |
# 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
|
466 |
ifneq (,$$($1_COPY)$$($1_COPY_FILES)) |
20363 | 467 |
# Search for all files to be copied. |
468 |
$1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS)) |
|
469 |
# Copy these explicitly |
|
470 |
$1_ALL_COPIES += $$($1_COPY_FILES) |
|
471 |
# Copy must also respect filters. |
|
472 |
ifneq (,$$($1_INCLUDES)) |
|
473 |
$1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES)) |
|
13697 | 474 |
endif |
20363 | 475 |
ifneq (,$$($1_EXCLUDES)) |
476 |
$1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES)) |
|
477 |
endif |
|
478 |
ifneq (,$$($1_EXCLUDE_FILES)) |
|
479 |
$1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES)) |
|
13697 | 480 |
endif |
23162
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
481 |
endif |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
482 |
# All files below META-INF are always copied. |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
483 |
$1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS)) |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
484 |
ifneq (,$$($1_ALL_COPIES)) |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
485 |
# Yep, there are files to be copied! |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
486 |
$1_ALL_COPY_TARGETS:= |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
487 |
$$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i))) |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
488 |
# Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files! |
20363 | 489 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
490 |
|
20363 | 491 |
# 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
|
492 |
ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES)) |
20363 | 493 |
# Search for all files to be copied. |
494 |
$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
|
495 |
# Clean these explicitly |
cb2710310e93
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
22481
diff
changeset
|
496 |
$1_ALL_CLEANS += $$($1_CLEAN_FILES) |
20363 | 497 |
# Copy and clean must also respect filters. |
498 |
ifneq (,$$($1_INCLUDES)) |
|
499 |
$1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS)) |
|
500 |
endif |
|
501 |
ifneq (,$$($1_EXCLUDES)) |
|
502 |
$1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS)) |
|
503 |
endif |
|
504 |
ifneq (,$$($1_EXCLUDE_FILES)) |
|
505 |
$1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS)) |
|
506 |
endif |
|
507 |
ifneq (,$$($1_ALL_CLEANS)) |
|
508 |
# Yep, there are files to be copied and cleaned! |
|
509 |
$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
|
510 |
$$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_clean,$1,$$i))) |
20363 | 511 |
# Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files! |
512 |
endif |
|
513 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
514 |
|
20363 | 515 |
# Prep the source paths. |
20638 | 516 |
ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),) |
517 |
$$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE))) |
|
20363 | 518 |
else |
519 |
$$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC))) |
|
520 |
endif |
|
521 |
||
522 |
# Create a sed expression to remove the source roots and to replace / with . |
|
523 |
# and remove .java at the end. |
|
524 |
$1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g' |
|
525 |
||
526 |
ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes) |
|
527 |
ifneq (,$$($1_HEADERS)) |
|
528 |
$1_HEADERS_ARG := -h $$($1_HEADERS) |
|
13697 | 529 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
530 |
|
20363 | 531 |
# Using sjavac to compile. |
532 |
$1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
533 |
|
20363 | 534 |
# Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be |
535 |
# "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main" |
|
536 |
# and javac is simply replaced with sjavac. |
|
537 |
$1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC)) |
|
538 |
||
539 |
# Set the $1_REMOTE to spawn a background javac server. |
|
540 |
$1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC)))) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
541 |
|
20363 | 542 |
$$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS) |
543 |
$(MKDIR) -p $$(@D) |
|
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
544 |
$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp) |
20363 | 545 |
$(ECHO) Compiling $1 |
546 |
($$($1_JVM) $$($1_SJAVAC) \ |
|
547 |
$$($1_REMOTE) \ |
|
548 |
-j $(JOBS) \ |
|
549 |
--permit-unidentified-artifacts \ |
|
550 |
--permit-sources-without-package \ |
|
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
551 |
--compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \ |
20363 | 552 |
--log=$(LOG_LEVEL) \ |
553 |
$$($1_SJAVAC_ARGS) \ |
|
554 |
$$($1_FLAGS) \ |
|
555 |
$$($1_HEADERS_ARG) \ |
|
556 |
-d $$($1_BIN) && \ |
|
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
557 |
$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch) |
20363 | 558 |
else |
559 |
# Using plain javac to batch compile everything. |
|
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
560 |
$1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch |
14111 | 561 |
|
20363 | 562 |
# When building in batch, put headers in a temp dir to filter out those that actually |
563 |
# changed before copying them to the real header dir. |
|
564 |
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
|
565 |
$1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
566 |
|
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
567 |
$$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch |
14111 | 568 |
$(MKDIR) -p $$(@D) |
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
|
569 |
for f in `ls $$($1_HEADERS).$1.tmp`; do \ |
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
|
570 |
if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \ |
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
|
571 |
$(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \ |
14111 | 572 |
fi; \ |
573 |
done |
|
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
|
574 |
$(RM) -r $$($1_HEADERS).$1.tmp |
14111 | 575 |
$(TOUCH) $$@ |
576 |
||
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
577 |
$1 += $$($1_HEADERS)/_the.$1_headers |
20363 | 578 |
endif |
14111 | 579 |
|
20363 | 580 |
# When not using sjavac, pass along all sources to javac using an @file. |
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
581 |
$$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS) |
20363 | 582 |
$(MKDIR) -p $$(@D) |
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
583 |
$(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
|
584 |
$$(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
|
585 |
$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1 |
20363 | 586 |
($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \ |
587 |
-implicit:none -sourcepath "$$($1_SRCROOTSC)" \ |
|
21054
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
588 |
-d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \ |
dac7de31b5b5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20650
diff
changeset
|
589 |
$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch) |
14111 | 590 |
|
20363 | 591 |
endif |
592 |
||
593 |
# Check if a jar file was specified, then setup the rules for the jar. |
|
594 |
ifneq (,$$($1_JAR)) |
|
595 |
# If no suffixes was explicitly set for this jar file. |
|
596 |
# Use class and the cleaned/copied properties file suffixes as the default |
|
597 |
# for the types of files to be put into the jar. |
|
598 |
ifeq (,$$($1_SUFFIXES)) |
|
599 |
$1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
600 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
601 |
|
20363 | 602 |
$$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1), \ |
603 |
SRCS:=$$($1_BIN), \ |
|
604 |
SUFFIXES:=$$($1_SUFFIXES), \ |
|
605 |
EXCLUDE:=$$($1_EXCLUDES), \ |
|
606 |
INCLUDES:=$$($1_INCLUDES), \ |
|
607 |
EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \ |
|
608 |
JAR:=$$($1_JAR), \ |
|
609 |
JARMAIN:=$$($1_JARMAIN), \ |
|
610 |
MANIFEST:=$$($1_MANIFEST), \ |
|
611 |
EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \ |
|
612 |
JARINDEX:=$$($1_JARINDEX), \ |
|
613 |
HEADERS:=$$($1_HEADERS), \ |
|
614 |
SETUP:=$$($1_SETUP))) |
|
22480
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
615 |
|
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
616 |
# Add jar to target list |
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
617 |
$1 += $$($1_JAR) |
20363 | 618 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
619 |
|
20363 | 620 |
# Check if a srczip was specified, then setup the rules for the srczip. |
621 |
ifneq (,$$($1_SRCZIP)) |
|
622 |
$$(eval $$(call SetupZipArchive,ARCHIVE_$1, \ |
|
623 |
SRC:=$$($1_SRC), \ |
|
624 |
ZIP:=$$($1_SRCZIP), \ |
|
625 |
INCLUDES:=$$($1_INCLUDES), \ |
|
626 |
EXCLUDES:=$$($1_EXCLUDES), \ |
|
627 |
EXCLUDE_FILES:=$$($1_EXCLUDE_FILES))) |
|
22480
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
628 |
|
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
629 |
# Add zip to target list |
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
630 |
$1 += $$($1_SRCZIP) |
20363 | 631 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
632 |
endef |