make/CreateJars.gmk

rev 10818 : 8061382: Separate CLDR locale data from JRE locale data
Reviewed-by:

*** 78,98 ****
  
  LOCALEDATA_INCLUDES := sun/util/resources/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/META-INF/localedata-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))
--- 78,89 ----
  
  LOCALEDATA_INCLUDES := sun/util/resources/provider/NonEnLocaleDataMetaInfo.class
  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), \
      EXTRA_FILES := META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo, \
      JAR := $(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar, \
      SKIP_METAINF := true))
*** 439,459 ****
  # 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/META-INF/cldrdata-services/sun.util.locale.provider.LocaleDataMetaInfo
!         $(install-file)
! 
! $(eval $(call SetupArchive,BUILD_CLDRDATA_JAR, \
!     $(CLDR_METAINF_SERVICES), \
!     SRCS := $(JDK_OUTPUTDIR)/modules/jdk.localedata \
!         $(CLDR_SERVICES_DIR), \
      SUFFIXES := .class, \
      INCLUDES := sun/text/resources/cldr \
          sun/util/resources/cldr, \
      EXTRA_FILES := META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo, \
      JAR := $(CLDRDATA_JAR_DST), \
--- 430,441 ----
  # 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.cldr, \
      SUFFIXES := .class, \
      INCLUDES := sun/text/resources/cldr \
          sun/util/resources/cldr, \
      EXTRA_FILES := META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo, \
      JAR := $(CLDRDATA_JAR_DST), \