make/CreateJars.gmk

rev 10556 : 8038436: Re-examine the mechanism to determine available localedata and cldrdata
Reviewed-by:

*** 74,90 ****
  
  LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
      iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \
      th tr uk vi zh
  
! LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/, $(LOCALEDATA_INCLUDE_LOCALES)) \
      $(addprefix sun/util/resources/, $(LOCALEDATA_INCLUDE_LOCALES))
  
! $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR, , \
!     SRCS := $(JDK_OUTPUTDIR)/modules/jdk.localedata, \
      SUFFIXES := .class _dict _th, \
      INCLUDES := $(LOCALEDATA_INCLUDES), \
      JAR := $(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar, \
      SKIP_METAINF := true))
  
  ##########################################################################################
  #
--- 74,101 ----
  
  LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
      iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \
      th tr uk vi zh
  
! LOCALEDATA_INCLUDES := sun/util/locale/provider/NonEnLocaleDataMetaInfo.class
! LOCALEDATA_INCLUDES += $(addprefix sun/text/resources/, $(LOCALEDATA_INCLUDE_LOCALES)) \
      $(addprefix sun/util/resources/, $(LOCALEDATA_INCLUDE_LOCALES))
  
! LOCALEDATA_SERVICES_DIR := $(IMAGES_OUTPUTDIR)/localemetainfo
! 
! LOCALEDATA_METAINF_SERVICES := $(LOCALEDATA_SERVICES_DIR)/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo
! 
! $(LOCALEDATA_METAINF_SERVICES): $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/locale/provider/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo
!         $(install-file)
! 
! $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR, \
!     $(LOCALEDATA_METAINF_SERVICES), \
!     SRCS := $(JDK_OUTPUTDIR)/modules/jdk.localedata \
!         $(LOCALEDATA_SERVICES_DIR), \
      SUFFIXES := .class _dict _th, \
      INCLUDES := $(LOCALEDATA_INCLUDES), \
+     EXTRA_FILES := META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo, \
      JAR := $(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar, \
      SKIP_METAINF := true))
  
  ##########################################################################################
  #
*** 208,217 ****
--- 219,230 ----
      sun/tools/native2ascii \
      sun/tools/serialver \
      sun/tools/tree \
      sun/tools/util \
      sun/util/cldr/CLDRLocaleDataMetaInfo.class \
+     sun/util/locale/provider/NonEnLocaleDataMetaInfo.class \
+     META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo \
      sun/util/resources/cldr \
      $(LOCALEDATA_INCLUDES) \
      com/oracle/jrockit/jfr \
      oracle/jrockit/jfr \
      jdk/jfr \
*** 427,443 ****
  # Get the CLDRVERSION
  include gensrc/GensrcCLDR.gmk
  
  CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
  
! $(eval $(call SetupArchive,BUILD_CLDRDATA_JAR, , \
      SRCS := $(JDK_OUTPUTDIR)/modules/jdk.localedata \
!         $(JDK_OUTPUTDIR)/modules/java.base, \
      SUFFIXES := .class, \
      INCLUDES := sun/text/resources/cldr \
          sun/util/cldr/CLDRLocaleDataMetaInfo.class \
          sun/util/resources/cldr, \
      JAR := $(CLDRDATA_JAR_DST), \
      EXTRA_MANIFEST_ATTR := CLDR-Version: $(CLDRVERSION), \
      SKIP_METAINF := true))
  
  ##########################################################################################
--- 440,466 ----
  # Get the CLDRVERSION
  include gensrc/GensrcCLDR.gmk
  
  CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
  
! CLDR_SERVICES_DIR := $(IMAGES_OUTPUTDIR)/cldrmetainfo
! 
! CLDR_METAINF_SERVICES := $(CLDR_SERVICES_DIR)/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo
! 
! $(CLDR_METAINF_SERVICES): $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/sun.util.locale.provider.LocaleDataMetaInfo
!         $(install-file)
! 
! $(eval $(call SetupArchive,BUILD_CLDRDATA_JAR, \
!     $(CLDR_METAINF_SERVICES), \
      SRCS := $(JDK_OUTPUTDIR)/modules/jdk.localedata \
!         $(JDK_OUTPUTDIR)/modules/java.base \
!         $(CLDR_SERVICES_DIR), \
      SUFFIXES := .class, \
      INCLUDES := sun/text/resources/cldr \
          sun/util/cldr/CLDRLocaleDataMetaInfo.class \
          sun/util/resources/cldr, \
+     EXTRA_FILES := META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo, \
      JAR := $(CLDRDATA_JAR_DST), \
      EXTRA_MANIFEST_ATTR := CLDR-Version: $(CLDRVERSION), \
      SKIP_METAINF := true))
  
  ##########################################################################################