[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openjdk-build-dev
Subject:    Re: RFR: JDK-8147086: Excluding of copy files broken after JDK-8144226
From:       Magnus Ihse Bursie <magnus.ihse.bursie () oracle ! com>
Date:       2016-01-14 11:07:49
Message-ID: 56978185.7070402 () oracle ! com
[Download RAW message or body]

On 2016-01-14 12:06, Erik Joelsson wrote:
> Since JDK-8144226, the java.desktop module is including more resource 
> files than it used to. This is caused by a small bug in 
> SetupJavaCompilation.gmk that fails to apply exclude patterns on files 
> to be copied. The fix is simple:
>
> diff -r 4b01ea6c12c3 make/common/JavaCompilation.gmk
> --- a/make/common/JavaCompilation.gmk
> +++ b/make/common/JavaCompilation.gmk
> @@ -267,7 +267,7 @@
>      $1_ALL_COPIES := $$(filter $$($1_INCLUDE_PATTERN),$$($1_ALL_COPIES))
>    endif
>    ifneq (,$$($1_EXCLUDE_PATTERN))
> - $1_ALL_COPIES := $$(filter-out 
> $$($1_EXCLUDES_PATTERN),$$($1_ALL_COPIES))
> + $1_ALL_COPIES := $$(filter-out 
> $$($1_EXCLUDE_PATTERN),$$($1_ALL_COPIES))
>    endif
>    ifneq (,$$($1_ALL_COPIES))
>      # Yep, there are files to be copied!
>
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8147086

Looks good to me.

/Magnus
[prev in list] [next in list] [prev in thread] [next in thread]