RFR: JDK-8130109: Incremental build of java.base-gensrc broken
Hello, Please review this small patch which fixes the incremental build of java.base-gensrc. There is a slight mistake in jdk/make/gensrc/GensrcCLDR.gmk where the target file of a rule has the wrong path, so make will always think it needs to be generated. Bug: https://bugs.openjdk.java.net/browse/JDK-8130109 Patch: diff -r 68ce12551103 make/gensrc/GensrcCLDR.gmk --- a/make/gensrc/GensrcCLDR.gmk +++ b/make/gensrc/GensrcCLDR.gmk @@ -29,7 +29,7 @@ GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata -CLDR_BASEMETAINFO_FILE := $(GENSRC_DIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java +CLDR_BASEMETAINFO_FILE := $(GENSRC_BASEDIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java CLDR_BASE_LOCALES := en-US /Erik
Re: RFR: JDK-8130109: Incremental build of java.base-gensrc broken
Hi Erik: Please review this small patch which fixes the incremental build of java.base-gensrc. There is a slight mistake in jdk/make/gensrc/GensrcCLDR.gmk where the target file of a rule has the wrong path, so make will always think it needs to be generated. Bug: https://bugs.openjdk.java.net/browse/JDK-8130109 Patch: diff -r 68ce12551103 make/gensrc/GensrcCLDR.gmk --- a/make/gensrc/GensrcCLDR.gmk +++ b/make/gensrc/GensrcCLDR.gmk @@ -29,7 +29,7 @@ GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata -CLDR_BASEMETAINFO_FILE := $(GENSRC_DIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java +CLDR_BASEMETAINFO_FILE := $(GENSRC_BASEDIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java CLDR_BASE_LOCALES := en-US Looks good to me. /Tim
Re: RFR: JDK-8130109: Incremental build of java.base-gensrc broken
+1 Naoto On 6/30/15 12:49 AM, Erik Joelsson wrote: Hello, Please review this small patch which fixes the incremental build of java.base-gensrc. There is a slight mistake in jdk/make/gensrc/GensrcCLDR.gmk where the target file of a rule has the wrong path, so make will always think it needs to be generated. Bug: https://bugs.openjdk.java.net/browse/JDK-8130109 Patch: diff -r 68ce12551103 make/gensrc/GensrcCLDR.gmk --- a/make/gensrc/GensrcCLDR.gmk +++ b/make/gensrc/GensrcCLDR.gmk @@ -29,7 +29,7 @@ GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata -CLDR_BASEMETAINFO_FILE := $(GENSRC_DIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java +CLDR_BASEMETAINFO_FILE := $(GENSRC_BASEDIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java CLDR_BASE_LOCALES := en-US /Erik
