stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6903197: Some java template files need to be renamed to .java.template

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Kelly O'Hair 2009-11-30 14:15:15 -08:00
parent 547328d305
commit cd8f275bdb
14 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/java/java/Makefile
View File

@ -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)" \
$< $@

2
jdk/make/java/java/genlocales.gmk
View File

@ -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"

2
jdk/make/java/java/localegen.sh
View File

@ -27,7 +27,7 @@
#
# This script is to generate the supported locale list string and replace the
# LocaleDataMetaInfo-XLocales.java in <ws>/src/share/classes/sun/util
# LocaleDataMetaInfo-XLocales.java.template in <ws>/src/share/classes/sun/util
#
# SORT, NAWK & SED is passed in as environment variables.
#

2
jdk/make/java/nio/Makefile
View File

@ -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

2
jdk/make/netbeans/README
View File

@ -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/ \

4
jdk/make/sun/nio/Makefile
View File

@ -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)

0
jdk/make/tools/CharsetMapping/DoubleByte-X.java → jdk/make/tools/CharsetMapping/DoubleByte-X.java.template
View File

0
jdk/make/tools/CharsetMapping/SingleByte-X.java → jdk/make/tools/CharsetMapping/SingleByte-X.java.template
View File

2
jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
View File

@ -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);

2
jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
View File

@ -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);
}
}

0
jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java → jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
View File

0
jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java → jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
View File

0
jdk/test/java/util/Formatter/Basic-X.java → jdk/test/java/util/Formatter/Basic-X.java.template
View File

6
jdk/test/java/util/Formatter/genBasic.sh
View File

@ -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 -Kprim<Basic-X.java >Basic$2.java
# else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 <Basic-X.java >Basic$2.java
# then $SPP -K$1 -Dtype=$1 -DType=$2 -Kprim<Basic-X.java.template >Basic$2.java
# else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 <Basic-X.java.template >Basic$2.java
# fi
java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java >Basic$2.java
java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java.template >Basic$2.java
}
gen boolean Boolean prim "" "" ""