make/gensrc/GensrcLocaleData.gmk

Print this page
rev 10673 : 8058509: CLDRLocaleDataMetaInfo should be in jdk.localedata
Reviewed-by:

*** 128,139 **** $(MKDIR) -p $(@D) $(ECHO) Creating sun/util/resources/provider/NonEnLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources. $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" > $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources $(SED) $(SED_NONENARGS) $< > $@ ! GENSRC_LOCALEDATAMETAINFO := $(JDK_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/EnLocaleDataMetaInfo.java \ ! $(JDK_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonEnLocaleDataMetaInfo.java ################################################################################ GENSRC_CRBC_DST := $(JDK_OUTPUTDIR)/gensrc/java.base/sun/util/CoreResourceBundleControl.java GENSRC_CRBC_CMD := $(JDK_TOPDIR)/make/scripts/localelist.sh --- 128,139 ---- $(MKDIR) -p $(@D) $(ECHO) Creating sun/util/resources/provider/NonEnLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources. $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" > $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources $(SED) $(SED_NONENARGS) $< > $@ ! GENSRC_BASELOCALEDATA := $(JDK_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/EnLocaleDataMetaInfo.java ! GENSRC_LOCALEDATA := $(JDK_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonEnLocaleDataMetaInfo.java ################################################################################ GENSRC_CRBC_DST := $(JDK_OUTPUTDIR)/gensrc/java.base/sun/util/CoreResourceBundleControl.java GENSRC_CRBC_CMD := $(JDK_TOPDIR)/make/scripts/localelist.sh
*** 143,151 **** $(GENSRC_CRBC_DST): $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \ $(GENSRC_CRBC_CMD) $(MKDIR) -p $(@D) NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@ ! GENSRC_LOCALEDATAMETAINFO += $(GENSRC_CRBC_DST) ! GENSRC_JAVA_BASE += $(GENSRC_LOCALEDATAMETAINFO) ################################################################################ --- 143,152 ---- $(GENSRC_CRBC_DST): $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \ $(GENSRC_CRBC_CMD) $(MKDIR) -p $(@D) NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@ ! GENSRC_BASELOCALEDATA += $(GENSRC_CRBC_DST) ! GENSRC_JAVA_BASE += $(GENSRC_BASELOCALEDATA) ! GENSRC_JDK_LOCALEDATA += $(GENSRC_LOCALEDATA) ################################################################################