makefiles/CreateJars.gmk
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)
@@ -72,41 +72,19 @@
JARS+=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar
##########################################################################################
-LOCALEDATA_INCLUDE_PATTERNS := \
- sun/text/resources/*_ar* \
- sun/text/resources/*_hi* \
- sun/text/resources/*_iw* \
- sun/text/resources/*_iw* \
- sun/text/resources/*_ja* \
- sun/text/resources/*_ko* \
- sun/text/resources/*_th.* \
- sun/text/resources/*_th_* \
- sun/text/resources/*_vi* \
- sun/text/resources/*_zh* \
- sun/text/resources/*Data_th \
- sun/text/resources/thai_dict \
- sun/util/resources/*_ar* \
- sun/util/resources/*_hi* \
- sun/util/resources/*_iw* \
- sun/util/resources/*_iw* \
- sun/util/resources/*_ja* \
- sun/util/resources/*_ko* \
- sun/util/resources/*_th_* \
- sun/util/resources/*_th.* \
- sun/util/resources/*_vi* \
- sun/util/resources/*_zh*
+LOCALEDATA_INCLUDE_LOCALES := ar hi iw ja ko th vi zh
+LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/,$(LOCALEDATA_INCLUDE_LOCALES)) \
+ $(addprefix sun/util/resources/,$(LOCALEDATA_INCLUDE_LOCALES))
-LOCALEDATA_INCLUDES := $(patsubst $(JDK_OUTPUTDIR)/classes/%,%,\
- $(foreach i,$(LOCALEDATA_INCLUDE_PATTERNS), $(wildcard $(JDK_OUTPUTDIR)/classes/$i)))
-
$(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes,\
SUFFIXES:=.class _dict _th,\
INCLUDES:=$(LOCALEDATA_INCLUDES),\
+ EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\
JAR:=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar,\
SKIP_METAINF:=true))
JARS+=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar
@@ -242,11 +220,14 @@
javax/swing/JTreeBeanInfo.class \
javax/swing/JWindowBeanInfo.class \
javax/swing/SwingBeanInfoBase.class \
javax/swing/text/JTextComponentBeanInfo.class \
sun/swing/BeanInfoUtils.class \
- $(LOCALEDATA_INCLUDES)
+ $(LOCALEDATA_INCLUDES) \
+ sun/text/resources/cldr \
+ sun/util/resources/cldr \
+ sun/util/cldr/CLDRLocaleDataMetaInfo.class
# These files should never be put into rt.jar
# but due to a misstake...some are put there if embedded
#
ifneq ($(JAVASE_EMBEDDED), true)
@@ -631,10 +612,30 @@
endif
endif
##########################################################################################
+
+# Get the CLDRVERSION
+include GensrcCLDR.gmk
+
+CLDRDATA_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/cldrdata.jar
+
+$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR,$(CLDRDATA_DEPS),\
+ SRCS:=$(JDK_OUTPUTDIR)/classes,\
+ SUFFIXES:=.class,\
+ INCLUDES:=sun/text/resources/cldr \
+ sun/util/cldr \
+ sun/util/resources/cldr,\
+ EXCLUDES:=sun/util/cldr/CLDRLocaleProviderAdapter,\
+ JAR:=$(CLDRDATA_JAR_DST),\
+ EXTRA_MANIFEST_ATTR:=CLDR-Version: $(CLDRVERSION),\
+ SKIP_METAINF:=true))
+
+JARS += $(CLDRDATA_JAR_DST)
+
+##########################################################################################
TOOLS_JAR_INCLUDES := \
sun/tools/asm \
sun/tools/jar \
sun/tools/java \