OpenJDK / portola / portola
changeset 27753:a6c284fa0745
8065412: generated source to compile .properties file incorreectly includes the module name in the package name
Reviewed-by: tbell, mchung, ihse
| author | erikj |
|---|---|
| date | Mon, 24 Nov 2014 11:40:49 +0100 |
| parents | 3f181f406145 |
| children | ee2f7768e1c9 |
| files | jdk/make/gensrc/GensrcProperties.gmk |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/gensrc/GensrcProperties.gmk Sat Nov 22 14:56:16 2014 +0000 +++ b/jdk/make/gensrc/GensrcProperties.gmk Mon Nov 24 11:40:49 2014 +0100 @@ -58,13 +58,15 @@ $1_CLASS := $3 # Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties - # to .../langtools/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java + # to .../support/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java # Strip away prefix and suffix, leaving for example only: # "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN" $1_JAVAS := $$(patsubst $(JDK_TOPDIR)/src/%, \ $(JDK_OUTPUTDIR)/gensrc/%, \ $$(patsubst %.properties, %.java, \ - $$(subst /share/classes,, $$($1_SRCS)))) + $$(subst /$(OPENJDK_TARGET_OS)/classes,, \ + $$(subst /$(OPENJDK_TARGET_OS_TYPE)/classes,, \ + $$(subst /share/classes,, $$($1_SRCS)))))) # Generate the package dirs for the to be generated java files. Sort to remove # duplicates.