From d4524f338578487582fa762c86f0363db6c4b601 Mon Sep 17 00:00:00 2001 From: ohair Date: Mon, 30 Nov 2009 14:15:15 -0800 Subject: [PATCH] 6903197: Some java template files need to be renamed to .java.template Reviewed-by: alanb --- make/java/java/Makefile | 2 +- make/java/java/genlocales.gmk | 2 +- make/java/java/localegen.sh | 2 +- make/java/nio/Makefile | 2 +- make/netbeans/README | 2 +- make/sun/nio/Makefile | 4 +++- .../{DoubleByte-X.java => DoubleByte-X.java.template} | 0 .../{SingleByte-X.java => SingleByte-X.java.template} | 0 make/tools/src/build/tools/charsetmapping/GenerateDBCS.java | 2 +- make/tools/src/build/tools/charsetmapping/GenerateSBCS.java | 2 +- ...ava => CoreResourceBundleControl-XLocales.java.template} | 0 ...cales.java => LocaleDataMetaInfo-XLocales.java.template} | 0 .../util/Formatter/{Basic-X.java => Basic-X.java.template} | 0 test/java/util/Formatter/genBasic.sh | 6 +++--- 14 files changed, 13 insertions(+), 11 deletions(-) rename make/tools/CharsetMapping/{DoubleByte-X.java => DoubleByte-X.java.template} (100%) rename make/tools/CharsetMapping/{SingleByte-X.java => SingleByte-X.java.template} (100%) rename src/share/classes/sun/util/{CoreResourceBundleControl-XLocales.java => CoreResourceBundleControl-XLocales.java.template} (100%) rename src/share/classes/sun/util/{LocaleDataMetaInfo-XLocales.java => LocaleDataMetaInfo-XLocales.java.template} (100%) rename test/java/util/Formatter/{Basic-X.java => Basic-X.java.template} (100%) diff --git a/make/java/java/Makefile b/make/java/java/Makefile index 8755a4c3a..b0e40530f 100644 --- a/make/java/java/Makefile +++ b/make/java/java/Makefile @@ -390,7 +390,7 @@ clean:: LOCALES_GEN_SH = localelist.sh $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java: \ - $(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java $(LOCALES_GEN_SH) + $(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java.template $(LOCALES_GEN_SH) @$(prep-target) NAWK="$(NAWK)" SED="$(SED)" $(SH) $(LOCALES_GEN_SH) "$(JRE_NONEXIST_LOCALES)" \ $< $@ diff --git a/make/java/java/genlocales.gmk b/make/java/java/genlocales.gmk index bda003b9c..3adb76949 100644 --- a/make/java/java/genlocales.gmk +++ b/make/java/java/genlocales.gmk @@ -68,7 +68,7 @@ NonEuro_Resources_properties := $(FILES_compiled_properties) FILES_java := $(FILES_java_orig) FILES_compiled_properties := $(FILES_compiled_properties_orig) -LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/LocaleDataMetaInfo-XLocales.java +LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template LocaleDataMetaInfo_Dest=$(GENSRCDIR)/sun/util/LocaleDataMetaInfo.java LOCALEGEN_SH=localegen.sh RESOURCE_NAMES="FormatData CollationData TimeZoneNames LocaleNames CurrencyNames CalendarData" diff --git a/make/java/java/localegen.sh b/make/java/java/localegen.sh index 8f79eaebb..a21c515dc 100644 --- a/make/java/java/localegen.sh +++ b/make/java/java/localegen.sh @@ -27,7 +27,7 @@ # # This script is to generate the supported locale list string and replace the -# LocaleDataMetaInfo-XLocales.java in /src/share/classes/sun/util +# LocaleDataMetaInfo-XLocales.java.template in /src/share/classes/sun/util # # SORT, NAWK & SED is passed in as environment variables. # diff --git a/make/java/nio/Makefile b/make/java/nio/Makefile index e0cb40839..455d7529f 100644 --- a/make/java/nio/Makefile +++ b/make/java/nio/Makefile @@ -834,7 +834,7 @@ $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE) GENCSSRC = $(BUILDDIR)/tools/CharsetMapping CHARSETMAPPING_JARFILE = $(BUILDTOOLJARDIR)/charsetmapping.jar -$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java $(GENCSSRC)/sbcs +$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java.template $(GENCSSRC)/sbcs @$(prep-target) $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSSRC) $(SCS_GEN) sbcs diff --git a/make/netbeans/README b/make/netbeans/README index 9c7131900..8f68dce0e 100644 --- a/make/netbeans/README +++ b/make/netbeans/README @@ -411,7 +411,7 @@ Creating your own NetBeans project java/util/regex/,\ java/util/spi/,\ java/util/zip/,\ - **/*-XLocales.java + **/*-XLocales.java.template jtreg.tests=\ java/util/**/*Collection/ \ java/util/**/*Map/ \ diff --git a/make/sun/nio/Makefile b/make/sun/nio/Makefile index e83c6f1f3..4b46a1fb7 100644 --- a/make/sun/nio/Makefile +++ b/make/sun/nio/Makefile @@ -82,7 +82,9 @@ $(FILES_DAT): $(FILES_MAP) $(FILES_MAP) $(FILES_DAT) sjis0213 -$(FILES_genout_extcs): $(GENCSDATASRC)/SingleByte-X.java $(GENCSDATASRC)/DoubleByte-X.java \ +$(FILES_genout_extcs): \ + $(GENCSDATASRC)/SingleByte-X.java.template \ + $(GENCSDATASRC)/DoubleByte-X.java.template \ $(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs @$(prep-target) $(RM) -r $(GENCSEXT) diff --git a/make/tools/CharsetMapping/DoubleByte-X.java b/make/tools/CharsetMapping/DoubleByte-X.java.template similarity index 100% rename from make/tools/CharsetMapping/DoubleByte-X.java rename to make/tools/CharsetMapping/DoubleByte-X.java.template diff --git a/make/tools/CharsetMapping/SingleByte-X.java b/make/tools/CharsetMapping/SingleByte-X.java.template similarity index 100% rename from make/tools/CharsetMapping/SingleByte-X.java rename to make/tools/CharsetMapping/SingleByte-X.java.template diff --git a/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java b/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java index f38e759c4..27dc8719b 100644 --- a/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java +++ b/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java @@ -63,7 +63,7 @@ public class GenerateDBCS { int b2Min = toInteger(fields[8]); int b2Max = toInteger(fields[9]); System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName); - genClass(args[0], args[1], "DoubleByte-X.java", + genClass(args[0], args[1], "DoubleByte-X.java.template", clzName, csName, hisName, pkgName, isASCII, type, b1Min, b1Max, b2Min, b2Max); diff --git a/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java b/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java index 8a57a6521..cb6496e0a 100644 --- a/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java +++ b/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java @@ -55,7 +55,7 @@ public class GenerateSBCS { String pkgName = fields[4]; System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName); - genClass(args[0], args[1], "SingleByte-X.java", + genClass(args[0], args[1], "SingleByte-X.java.template", clzName, csName, hisName, pkgName, isASCII); } } diff --git a/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java b/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template similarity index 100% rename from src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java rename to src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template diff --git a/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java b/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template similarity index 100% rename from src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java rename to src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template diff --git a/test/java/util/Formatter/Basic-X.java b/test/java/util/Formatter/Basic-X.java.template similarity index 100% rename from test/java/util/Formatter/Basic-X.java rename to test/java/util/Formatter/Basic-X.java.template diff --git a/test/java/util/Formatter/genBasic.sh b/test/java/util/Formatter/genBasic.sh index 2c352ad39..819afe7cd 100644 --- a/test/java/util/Formatter/genBasic.sh +++ b/test/java/util/Formatter/genBasic.sh @@ -27,10 +27,10 @@ javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java gen() { # if [ $3 = "true" ] -# then $SPP -K$1 -Dtype=$1 -DType=$2 -KprimBasic$2.java -# else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 Basic$2.java +# then $SPP -K$1 -Dtype=$1 -DType=$2 -KprimBasic$2.java +# else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 Basic$2.java # fi - java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 Basic$2.java + java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 Basic$2.java } gen boolean Boolean prim "" "" "" -- GitLab