Uploaded image for project: 'JDK'
  1. JDK
  2. JDK-8147086

Excluding of copy files broken after JDK-8144226

    XMLWordPrintable

Details

    • b102

    Description

      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!

      Attachments

        Issue Links

          Activity

            People

              erikj Erik Joelsson
              erikj Erik Joelsson
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: