comparison make/common/JavaCompilation.gmk @ 1858:4a8a7397e3f0

8147086: Excluding of copy files broken after JDK-8144226 Reviewed-by: ihse
author erikj
date Thu, 14 Jan 2016 13:50:40 +0100
parents 4b01ea6c12c3
children 0dd4e511e076
comparison
equal deleted inserted replaced
49:af20edacdad0 50:20a5d721c836
265 # Copy must also respect filters. 265 # Copy must also respect filters.
266 ifneq (,$$($1_INCLUDE_PATTERN)) 266 ifneq (,$$($1_INCLUDE_PATTERN))
267 $1_ALL_COPIES := $$(filter $$($1_INCLUDE_PATTERN),$$($1_ALL_COPIES)) 267 $1_ALL_COPIES := $$(filter $$($1_INCLUDE_PATTERN),$$($1_ALL_COPIES))
268 endif 268 endif
269 ifneq (,$$($1_EXCLUDE_PATTERN)) 269 ifneq (,$$($1_EXCLUDE_PATTERN))
270 $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDES_PATTERN),$$($1_ALL_COPIES)) 270 $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_PATTERN),$$($1_ALL_COPIES))
271 endif 271 endif
272 ifneq (,$$($1_ALL_COPIES)) 272 ifneq (,$$($1_ALL_COPIES))
273 # Yep, there are files to be copied! 273 # Yep, there are files to be copied!
274 $1_ALL_COPY_TARGETS:= 274 $1_ALL_COPY_TARGETS:=
275 $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i))) 275 $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))