make/gensrc/GensrcProperties.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 57,66 ****
--- 57,67 ----
  # Remaining parameters are named arguments. These include:
  # SRC_DIRS   Directories containing properties files to process.
  # EXCLUDE   Exclude files matching this pattern.
  # CLASS   The super class for the generated classes.
  # MODULE_PATH_ROOT   Module path root, defaults to $(TOPDIR)/src.
+ # KEEP_ALL_TRANSLATIONS Set to true to skip filtering of excluded translations.
  SetupCompileProperties = $(NamedParamsMacroTemplate)
  define SetupCompilePropertiesBody
    # Set default value unless overridden
    ifeq ($$($1_MODULE_PATH_ROOT), )
      $1_MODULE_PATH_ROOT := $(TOPDIR)/src
*** 71,84 ****
  
    ifneq ($$($1_EXCLUDE), )
      $1_SRC_FILES := $$(filter-out $$($1_EXCLUDE), $$($1_SRC_FILES))
    endif
  
    # Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
    # to .../support/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java
-   # Strip away prefix and suffix, leaving for example only:
-   # "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN"
    $1_JAVAS := $$(patsubst $$($1_MODULE_PATH_ROOT)/%, \
        $(SUPPORT_OUTPUTDIR)/gensrc/%, \
        $$(patsubst %.properties, %.java, \
        $$(subst /$(OPENJDK_TARGET_OS)/classes,, \
        $$(subst /$(OPENJDK_TARGET_OS_TYPE)/classes,, \
--- 72,88 ----
  
    ifneq ($$($1_EXCLUDE), )
      $1_SRC_FILES := $$(filter-out $$($1_EXCLUDE), $$($1_SRC_FILES))
    endif
  
+   # Filter out any excluded translations
+   ifneq ($$($1_KEEP_ALL_TRANSLATIONS), true)
+     $1_SRC_FILES := $$(call FilterExcludedTranslations, $$($1_SRC_FILES), .properties)
+   endif
+ 
    # Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
    # to .../support/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java
    $1_JAVAS := $$(patsubst $$($1_MODULE_PATH_ROOT)/%, \
        $(SUPPORT_OUTPUTDIR)/gensrc/%, \
        $$(patsubst %.properties, %.java, \
        $$(subst /$(OPENJDK_TARGET_OS)/classes,, \
        $$(subst /$(OPENJDK_TARGET_OS_TYPE)/classes,, \
*** 97,107 ****
        $$(addprefix _SPACE_, $$($1_JAVAS)))))
  
    $1_TARGET := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.$1.marker
    $1_CMDLINE_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.$1.cmdline
  
! # Now setup the rule for the generation of the resource bundles.
    $$($1_TARGET): $$($1_SRC_FILES) $$($1_JAVAS) $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $$(@D) $$($1_DIRS)
          $(ECHO) Compiling $$(words $$($1_SRC_FILES)) properties into resource bundles for $(MODULE)
          $$(eval $$(call ListPathsSafely, $1_CMDLINE, $$($1_CMDLINE_FILE)))
          $(TOOL_COMPILEPROPERTIES) -quiet @$$($1_CMDLINE_FILE)
--- 101,111 ----
        $$(addprefix _SPACE_, $$($1_JAVAS)))))
  
    $1_TARGET := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.$1.marker
    $1_CMDLINE_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.$1.cmdline
  
!   # Now setup the rule for the generation of the resource bundles.
    $$($1_TARGET): $$($1_SRC_FILES) $$($1_JAVAS) $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $$(@D) $$($1_DIRS)
          $(ECHO) Compiling $$(words $$($1_SRC_FILES)) properties into resource bundles for $(MODULE)
          $$(eval $$(call ListPathsSafely, $1_CMDLINE, $$($1_CMDLINE_FILE)))
          $(TOOL_COMPILEPROPERTIES) -quiet @$$($1_CMDLINE_FILE)