Print this page
rev 5696 : 6336885: RFE: Locale Data Deployment Enhancements
4609153: Provide locale data for Indic locales
5104387: Support for gl_ES locale (galician language)
6337471: desktop/system locale preferences support
7056139: (cal) SPI support for locale-dependent Calendar parameters
7058206: Provide CalendarData SPI for week params and display field value names
7073852: Support multiple scripts for digits and decimal symbols per locale
7079560: [Fmt-Da] Context dependent month names support in SimpleDateFormat
7171324: getAvailableLocales() of locale sensitive services should return the actual availability of locales
7151414: (cal) Support calendar type identification
7168528: LocaleServiceProvider needs to be aware of Locale extensions
7171372: (cal) locale's default Calendar should be created if unknown calendar is specified
Summary: JEP 127: Improve Locale Data Packaging and Adopt Unicode CLDR Data (part 1 w/o packaging changes. by Naoto Sato and Masayoshi Okutsu)

Split Close
Expand all
Collapse all
          --- old/makefiles/CreateJars.gmk
          +++ new/makefiles/CreateJars.gmk
↓ open down ↓ 66 lines elided ↑ open up ↑
  67   67                  SRCS:=$(JDK_OUTPUTDIR)/classes,\
  68   68                  INCLUDES:=sun/net/spi/nameservice/dns,\
  69   69                  EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\
  70   70                  JAR:=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar,\
  71   71                  SKIP_METAINF:=true))
  72   72  
  73   73  JARS+=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar
  74   74  
  75   75  ##########################################################################################
  76   76  
  77      -LOCALEDATA_INCLUDE_PATTERNS := \
  78      -        sun/text/resources/*_ar* \
  79      -        sun/text/resources/*_hi* \
  80      -        sun/text/resources/*_iw* \
  81      -        sun/text/resources/*_iw* \
  82      -        sun/text/resources/*_ja* \
  83      -        sun/text/resources/*_ko* \
  84      -        sun/text/resources/*_th.* \
  85      -        sun/text/resources/*_th_* \
  86      -        sun/text/resources/*_vi* \
  87      -        sun/text/resources/*_zh* \
  88      -        sun/text/resources/*Data_th \
  89      -        sun/text/resources/thai_dict \
  90      -        sun/util/resources/*_ar* \
  91      -        sun/util/resources/*_hi* \
  92      -        sun/util/resources/*_iw* \
  93      -        sun/util/resources/*_iw* \
  94      -        sun/util/resources/*_ja* \
  95      -        sun/util/resources/*_ko* \
  96      -        sun/util/resources/*_th_* \
  97      -        sun/util/resources/*_th.* \
  98      -        sun/util/resources/*_vi* \
  99      -        sun/util/resources/*_zh*
       77 +LOCALEDATA_INCLUDE_LOCALES := ar hi iw ja ko th vi zh
       78 +LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/,$(LOCALEDATA_INCLUDE_LOCALES)) \
       79 +                       $(addprefix sun/util/resources/,$(LOCALEDATA_INCLUDE_LOCALES))
 100   80  
 101      -LOCALEDATA_INCLUDES := $(patsubst $(JDK_OUTPUTDIR)/classes/%,%,\
 102      -        $(foreach i,$(LOCALEDATA_INCLUDE_PATTERNS), $(wildcard $(JDK_OUTPUTDIR)/classes/$i)))
 103      -
 104   81  $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\
 105   82                  SRCS:=$(JDK_OUTPUTDIR)/classes,\
 106   83                  SUFFIXES:=.class _dict _th,\
 107   84                  INCLUDES:=$(LOCALEDATA_INCLUDES),\
       85 +                EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\
 108   86                  JAR:=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar,\
 109   87                  SKIP_METAINF:=true))
 110   88  
 111   89  JARS+=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar
 112   90  
 113   91  ##########################################################################################
 114   92  # rt.jar and resources.jar are being built in the same way as in the old build. They require
 115   93  # the files to be in a certain order and converting that is not easy and will not be needed
 116   94  # in jigsaw anyway.
 117   95  
↓ open down ↓ 119 lines elided ↑ open up ↑
 237  215          javax/swing/JTextAreaBeanInfo.class \
 238  216          javax/swing/JTextFieldBeanInfo.class \
 239  217          javax/swing/JTextPaneBeanInfo.class \
 240  218          javax/swing/JToggleButtonBeanInfo.class \
 241  219          javax/swing/JToolBarBeanInfo.class \
 242  220          javax/swing/JTreeBeanInfo.class \
 243  221          javax/swing/JWindowBeanInfo.class \
 244  222          javax/swing/SwingBeanInfoBase.class \
 245  223          javax/swing/text/JTextComponentBeanInfo.class \
 246  224          sun/swing/BeanInfoUtils.class \
 247      -        $(LOCALEDATA_INCLUDES)
      225 +        $(LOCALEDATA_INCLUDES) \
      226 +        sun/text/resources/cldr \
      227 +        sun/util/resources/cldr \
      228 +        sun/util/cldr/CLDRLocaleDataMetaInfo.class
 248  229  
 249  230  # These files should never be put into rt.jar
 250  231  # but due to a misstake...some are put there if embedded
 251  232  #
 252  233  ifneq ($(JAVASE_EMBEDDED), true)
 253  234  # normal (correct) case
 254  235  RT_JAR_EXCLUDES += \
 255  236          com/oracle/jrockit/jfr \
 256  237          oracle/jrockit/jfr
 257  238  else
↓ open down ↓ 368 lines elided ↑ open up ↑
 626  607          @$(ECHO) "\n>>>Installing prebuilt OracleUcrypto provider..."
 627  608          $(RM) $@
 628  609          $(CP) $< $@
 629  610  
 630  611  JARS += $(UCRYPTO_JAR_DST)
 631  612  
 632  613  endif
 633  614  endif
 634  615  
 635  616  ##########################################################################################
      617 +
      618 +# Get the CLDRVERSION
      619 +include GensrcCLDR.gmk
      620 +
      621 +CLDRDATA_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/cldrdata.jar
      622 +
      623 +$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR,$(CLDRDATA_DEPS),\
      624 +                SRCS:=$(JDK_OUTPUTDIR)/classes,\
      625 +                SUFFIXES:=.class,\
      626 +                INCLUDES:=sun/text/resources/cldr \
      627 +                          sun/util/cldr \
      628 +                          sun/util/resources/cldr,\
      629 +                EXCLUDES:=sun/util/cldr/CLDRLocaleProviderAdapter,\
      630 +                JAR:=$(CLDRDATA_JAR_DST),\
      631 +                EXTRA_MANIFEST_ATTR:=CLDR-Version: $(CLDRVERSION),\
      632 +                SKIP_METAINF:=true))
      633 +
      634 +JARS += $(CLDRDATA_JAR_DST)
      635 +
      636 +##########################################################################################
 636  637  
 637  638  TOOLS_JAR_INCLUDES := \
 638  639          sun/tools/asm           \
 639  640          sun/tools/jar           \
 640  641          sun/tools/java          \
 641  642          sun/tools/javac         \
 642  643          sun/tools/jcmd          \
 643  644          sun/tools/jps           \
 644  645          sun/tools/jstat         \
 645  646          sun/tools/jstatd        \
↓ open down ↓ 208 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX