system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve gen-locales.mk and gen-locale.sh to make test files with @ options work

Browse Source 
With out this, adding collation test files like localedata/gez_ER.UTF-8@abegede.in
does not work for locales which contain @ modifiers.

	* gen-locales.mk: Make test files which contain @ modifiers in their
        name work.
	* localedata/gen-locale.sh: Likewise.
This commit is contained in:
Mike FABIAN 2018-01-01 15:33:50 +01:00
parent ac3a3b4b0d
commit ce6636b06b
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2018-02-27 Mike FABIAN <mfabian@redhat.com>
* gen-locales.mk: Make test files which contain @ modifiers in their
name work.
* localedata/gen-locale.sh: Likewise.
2018-02-27 Mike FABIAN <mfabian@redhat.com> 2018-02-27 Mike FABIAN <mfabian@redhat.com>
* posix/tst-fnmatch.input: Fix results for range expressions * posix/tst-fnmatch.input: Fix results for range expressions

4
gen-locales.mk
View File

@ -1,8 +1,8 @@
# defines target $(gen-locales) that generates the locales given in $(LOCALES) # defines target $(gen-locales) that generates the locales given in $(LOCALES)
LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g') LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^@ ]*\(@[^ ]*\)\?/\1\2/g')
CHARMAPS := $(shell echo "$(LOCALES)" | \ CHARMAPS := $(shell echo "$(LOCALES)" | \
sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g) sed -e 's/[^ .]*[.]\([^@ ]*\)\(@[^@ ]*\)*/\1/g' -e s/SJIS/SHIFT_JIS/g)
CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES)) CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES))
gen-locales := $(addprefix $(common-objpfx)localedata/,$(CTYPE_FILES)) gen-locales := $(addprefix $(common-objpfx)localedata/,$(CTYPE_FILES))

5
localedata/gen-locale.sh
View File

@ -49,7 +49,8 @@ generate_locale ()
locfile=`echo $locfile|sed 's|.*/\([^/]*/LC_CTYPE\)|\1|'` locfile=`echo $locfile|sed 's|.*/\([^/]*/LC_CTYPE\)|\1|'`
locale=`echo $locfile|sed 's|\([^.]*\)[.].*/LC_CTYPE|\1|'` locale=`echo $locfile|sed 's|\([^.]*\)[.].*/LC_CTYPE|\1|'`
charmap=`echo $locfile|sed 's|[^.]*[.]\(.*\)/LC_CTYPE|\1|'` charmap=`echo $locfile|sed 's|[^.]*[.]\([^@ ]*\)\(@[^ ]*\)\?/LC_CTYPE|\1|'`
modifier=`echo $locfile|sed 's|[^.]*[.]\([^@ ]*\)\(@[^ ]*\)\?/LC_CTYPE|\2|'`
echo "Generating locale $locale.$charmap: this might take a while..." echo "Generating locale $locale.$charmap: this might take a while..."
@ -73,4 +74,4 @@ if [ "$charmap_real" = 'SHIFT_JIS' ] \
flags="$flags --no-warnings=ascii" flags="$flags --no-warnings=ascii"
fi fi
generate_locale $charmap_real $locale $locale.$charmap "$flags" generate_locale $charmap_real $locale$modifier $locale.$charmap$modifier "$flags"