6482445: j2se/make/java/java/localegen.sh uses 'sort' from PATH, could get system32/sort
Making sure the right 'sort' utility is found. Reviewed-by: tbell
This commit is contained in:
parent
ea297b80d9
commit
298642faa1
jdk/make/java/java
@ -80,7 +80,8 @@ $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
|
||||
@$(ECHO) $(subst .java,'\n',$(Euro_Resources_java)) >> $@.tmp.euro;
|
||||
@$(ECHO) $(subst .properties,'\n',$(NonEuro_Resources_properties)) > $@.tmp.noneuro;
|
||||
@$(ECHO) $(subst .java,'\n',$(NonEuro_Resources_java)) >> $@.tmp.noneuro;
|
||||
NAWK=$(NAWK) SED=$(SED) $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
|
||||
NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
|
||||
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
|
||||
$@.tmp.noneuro $< $@
|
||||
@$(RM) $@.tmp.euro $@.tmp.noneuro;
|
||||
|
||||
|
@ -29,7 +29,7 @@
|
||||
# This script is to generate the supported locale list string and replace the
|
||||
# LocaleDataMetaInfo-XLocales.java in <ws>/src/share/classes/sun/util
|
||||
#
|
||||
# NAWK & SED is passed in as environment variables.
|
||||
# SORT, NAWK & SED is passed in as environment variables.
|
||||
#
|
||||
|
||||
# A list of resource base name list;
|
||||
@ -47,7 +47,7 @@ OUTPUT_FILE=$5
|
||||
localelist=
|
||||
getlocalelist() {
|
||||
localelist=""
|
||||
localelist=`$NAWK -F$1_ '{print $2}' $2 | sort`
|
||||
localelist=`$NAWK -F$1_ '{print $2}' $2 | $SORT`
|
||||
}
|
||||
|
||||
sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@\" "
|
||||
|
Loading…
x
Reference in New Issue
Block a user