jdk/make/gensrc/GensrcLocaleData.gmk

*** 26,37 ****
  # Scan for all locale resources and extract for which locales there exists
  # resources. Then put this meta information about existing (supported?) locales
  # into LocaleDataMetaInfo.java
  
  # First go look for all locale files
! LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/java.base/share/classes \
!     $(JDK_TOPDIR)/src/jdk.localedata/share/classes \
      -name "FormatData_*.java" -o -name "FormatData_*.properties" -o \
      -name "CollationData_*.java" -o -name "CollationData_*.properties" -o \
      -name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
      -name "LocaleNames_*.java" -o -name "LocaleNames_*.properties" -o \
      -name "CurrencyNames_*.java" -o -name "CurrencyNames_*.properties" -o \
--- 26,38 ----
  # Scan for all locale resources and extract for which locales there exists
  # resources. Then put this meta information about existing (supported?) locales
  # into LocaleDataMetaInfo.java
  
  # First go look for all locale files
! LOCALE_FILES := $(shell $(FIND) \
!     $(JDK_TOPDIR)/src/$(MODULE)/share/classes/sun/text/resources \
!     $(JDK_TOPDIR)/src/$(MODULE)/share/classes/sun/util/resources \
      -name "FormatData_*.java" -o -name "FormatData_*.properties" -o \
      -name "CollationData_*.java" -o -name "CollationData_*.properties" -o \
      -name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
      -name "LocaleNames_*.java" -o -name "LocaleNames_*.properties" -o \
      -name "CurrencyNames_*.java" -o -name "CurrencyNames_*.properties" -o \
*** 40,60 ****
  
  # Then translate the locale files into for example: FormatData_sv
  LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES)))))
  
  # Include the list of resources found during the previous compile.
! -include $(SUPPORT_OUTPUTDIR)/gensrc/_the.locale_resources
  
  MISSING_RESOURCES := $(filter-out $(LOCALE_RESOURCES), $(PREV_LOCALE_RESOURCES))
  NEW_RESOURCES := $(filter-out $(PREV_LOCALE_RESOURCES), $(LOCALE_RESOURCES))
  
  ifneq (, $(MISSING_RESOURCES)$(NEW_RESOURCES))
    # There is a difference in the number of supported resources. Trigger a regeneration.
    $(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java \
!     $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java \
!     $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java \
      $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java)
  endif
  
  # The base locales
  BASE_LOCALES := en en-US
  
--- 41,65 ----
  
  # Then translate the locale files into for example: FormatData_sv
  LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES)))))
  
  # Include the list of resources found during the previous compile.
! -include $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.locale_resources
  
  MISSING_RESOURCES := $(filter-out $(LOCALE_RESOURCES), $(PREV_LOCALE_RESOURCES))
  NEW_RESOURCES := $(filter-out $(PREV_LOCALE_RESOURCES), $(LOCALE_RESOURCES))
  
  ifneq (, $(MISSING_RESOURCES)$(NEW_RESOURCES))
    # There is a difference in the number of supported resources. Trigger a regeneration.
+   ifeq ($(MODULE), java.base)
      $(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java \
!         $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java)
!   endif
!   ifeq ($(MODULE), jdk.localedata)
!     $(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java \
          $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java)
+   endif
  endif
  
  # The base locales
  BASE_LOCALES := en en-US
  
*** 119,140 ****
  SED_BASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_BASE_LOCALES))/g'
  SED_NONBASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_NON_BASE_LOCALES))/g'
  
  $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \
      $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
          $(MKDIR) -p $(@D)
-         $(ECHO) Creating sun/util/locale/provider/BaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources.
          $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
!             > $(SUPPORT_OUTPUTDIR)/gensrc/_the.locale_resources
          $(SED) $(SED_BASEARGS) $< > $@
  
  $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \
      $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
          $(MKDIR) -p $(@D)
-         $(ECHO) Creating sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources.
          $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
!             > $(SUPPORT_OUTPUTDIR)/gensrc/_the.locale_resources
          $(SED) $(SED_NONBASEARGS) $< > $@
  
  GENSRC_BASELOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java
  GENSRC_LOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java
  
--- 124,145 ----
  SED_BASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_BASE_LOCALES))/g'
  SED_NONBASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_NON_BASE_LOCALES))/g'
  
  $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \
      $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
+         $(call LogInfo, Creating sun/util/locale/provider/BaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources)
          $(MKDIR) -p $(@D)
          $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
!             > $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_the.locale_resources
          $(SED) $(SED_BASEARGS) $< > $@
  
  $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \
      $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
+         $(call LogInfo, Creating sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources)
          $(MKDIR) -p $(@D)
          $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
!             > $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/_the.locale_resources
          $(SED) $(SED_NONBASEARGS) $< > $@
  
  GENSRC_BASELOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java
  GENSRC_LOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java