diff options
| -rwxr-xr-x | newlib/libc/ctype/mkunidata | 34 | ||||
| -rwxr-xr-x | newlib/libc/string/mkunidata | 37 |
2 files changed, 53 insertions, 18 deletions
diff --git a/newlib/libc/ctype/mkunidata b/newlib/libc/ctype/mkunidata index ea18e6759..4bdf3bc81 100755 --- a/newlib/libc/ctype/mkunidata +++ b/newlib/libc/ctype/mkunidata @@ -1,6 +1,6 @@ #! /bin/sh -echo generating Unicode character properties data for newlib/libc/ctype +echo Generating Unicode character properties data for newlib/libc/ctype cd `dirname $0` @@ -8,23 +8,41 @@ cd `dirname $0` # checks and (with option -u) download case "$1" in +-h) echo "Usage: $0 [-h|-u|-i]" + echo "Generate case conversion table caseconv.t and character category table categories.t" + echo "from local Unicode file UnicodeData.txt." + echo "" + echo "Options:" + echo " -u download file from unicode.org first" + echo " -i copy file from /usr/share/unicode/ucd first" + echo " -h show this" + exit + ;; -u) - #WGET=wget -N -t 1 --timeout=55 - WGET=curl -R -O --connect-timeout 55 - WGET+=-z $@ + wget () { + curl -R -O --connect-timeout 55 -z "`basename $1`" "$1" + } echo downloading data from unicode.org for data in UnicodeData.txt - do $WGET http://unicode.org/Public/UNIDATA/$data + do wget http://unicode.org/Public/UNIDATA/$data done ;; -*) echo checking package unicode-ucd - grep unicode-ucd /etc/setup/installed.db || exit 9 +-i) + echo copying data from /usr/share/unicode/ucd + for data in UnicodeData.txt + do cp /usr/share/unicode/ucd/$data . + done ;; esac +echo checking Unicode data file for data in UnicodeData.txt -do test -r $data || ln -s /usr/share/unicode/ucd/$data . || exit 9 +do if [ -r $data ] + then true + else echo $data not available, skipping table generation + exit + fi done ############################################################################# diff --git a/newlib/libc/string/mkunidata b/newlib/libc/string/mkunidata index c0bf5de6c..7ebebeb07 100755 --- a/newlib/libc/string/mkunidata +++ b/newlib/libc/string/mkunidata @@ -1,6 +1,6 @@ #! /bin/sh -echo generating Unicode width data for newlib/libc/string/wcwidth.c +echo Generating Unicode width data for newlib/libc/string/wcwidth.c cd `dirname $0` PATH="$PATH":. # ensure access to uniset tool @@ -9,34 +9,51 @@ PATH="$PATH":. # ensure access to uniset tool # checks and (with option -u) downloads case "$1" in +-h) echo "Usage: $0 [-h|-u|-i]" + echo "Generate width data tables ambiguous.t, combining.t, wide.t" + echo "from local Unicode files UnicodeData.txt, Blocks.txt, EastAsianWidth.txt." + echo "" + echo "Options:" + echo " -u download files from unicode.org first, download uniset tool" + echo " -i copy files from /usr/share/unicode/ucd first" + echo " -h show this" + exit + ;; -u) - #WGET=wget -N -t 1 --timeout=55 - WGET=curl -R -O --connect-timeout 55 - WGET+=-z $@ + wget () { + curl -R -O --connect-timeout 55 -z "`basename $1`" "$1" + } echo downloading uniset tool - $WGET http://www.cl.cam.ac.uk/~mgk25/download/uniset.tar.gz + wget http://www.cl.cam.ac.uk/~mgk25/download/uniset.tar.gz gzip -dc uniset.tar.gz | tar xvf - uniset echo downloading data from unicode.org for data in UnicodeData.txt Blocks.txt EastAsianWidth.txt - do $WGET http://unicode.org/Public/UNIDATA/$data + do wget http://unicode.org/Public/UNIDATA/$data done ;; -*) echo checking package unicode-ucd - grep unicode-ucd /etc/setup/installed.db || exit 9 +-i) + echo copying data from /usr/share/unicode/ucd + for data in UnicodeData.txt Blocks.txt EastAsianWidth.txt + do cp /usr/share/unicode/ucd/$data . + done ;; esac echo checking uniset tool type uniset || exit 9 +echo checking Unicode data files for data in UnicodeData.txt Blocks.txt EastAsianWidth.txt -do test -r $data || ln -s /usr/share/unicode/ucd/$data . || exit 9 +do if [ -r $data ] + then true + else echo $data not available, skipping table generation + exit + fi done echo generating from Unicode version `sed -e 's,[^.0-9],,g' -e 1q Blocks.txt` -exit ############################################################################# # table generation |