make/gensrc/GensrcCLDR.gmk

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

@@ -22,13 +22,13 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
 
 CLDRVERSION := 21.0.1
-CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION))
+CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata.cldr/share/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION))
 
-GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc/jdk.localedata
+GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc/jdk.localedata.cldr
 
 CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo.java
 
 $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
     $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \

@@ -36,6 +36,6 @@
     $(BUILD_TOOLS_JDK)
         $(MKDIR) -p $(GENSRC_DIR)
         $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -o $(GENSRC_DIR)
 
 GENSRC_CLDR := $(CLDR_METAINFO_FILE)
-GENSRC_JDK_LOCALEDATA += $(GENSRC_CLDR)
+GENSRC_JDK_CLDRDATA += $(GENSRC_CLDR)