Andrew Black wrote:
Greetings Farid
May I propose the patch below as an alternative solution? While the
cost of running tr in addition to sed isn't too great in the grand
scheme of things, this removes the additional overhead of the second
function call.
I applied your patch until the names have been changed:
http://svn.apache.org/viewvc?rev=438309&view=rev
It might be worthwhile to also look at the regular
expressions used in GNUmakefile.bin file, particularly the rules for
$(LOCALE_LIST) and $(DEPENDDIR)/localedb.d. Each of these locations has
logic that makes similar translations.
Would you like to put together a patch? If not, could you please
open an issue so we don't forget? (A test case or something along
those lines demonstrating the problem you are pointing out would
be most helpful.)
A related issue I'm observing is that the en_US.ANSI_X3.4-1968 locale
fails as follows.
Same here (issue + patch please :)
Thanks
Martin
./en_US.ANSI_X3.4-1968.sh -d
RWSTD_SRC_ROOT=/build/ablack/stdcxx-test/etc/nls
export RWSTD_SRC_ROOT
RWSTD_LOCALE_ROOT=/tmp/locale.13281
export RWSTD_LOCALE_ROOT
./localedef -w -c -f /build/ablack/stdcxx-test/etc/nls/charmaps/ANSI_X3
-i /build/ablack/stdcxx-test/etc/nls/src/en_US.4-1968
/tmp/locale.13281/en_US.ANSI_X3.4-1968 2>/dev/tty
Error 500: /build/ablack/stdcxx-test/etc/nls/charmaps/ANSI_X3 could not
be opened for reading
Index: run_locale_utils.sh
===================================================================
--- run_locale_utils.sh (revision 432251)
+++ run_locale_utils.sh (working copy)
@@ -232,7 +232,7 @@
# get locale's name and encoding
locale_src=`echo $3 | \
- sed -n
"s:\([^\.]*\)\.\([EMAIL PROTECTED])\(.*\):\1\3:p;s:[EMAIL PROTECTED]::g"`;
+ sed -n
"s:\([^\.]*\)\.\([EMAIL PROTECTED])\(.*\):\1\3:;s:[EMAIL PROTECTED]::;y:@:.:;p"`;
locale_encoding=`echo $3 | \
sed -n "s:\([^\.]*\)\.\([EMAIL PROTECTED])\(.*\):\2:p"`;
Farid Zaripov wrote:
Attached is a patch for run_locale_utils.sh script. If locale name
is like [EMAIL PROTECTED] then locale src file name should be
lang.sublang instead of [EMAIL PROTECTED]
ChangeLog:
* run_locale_utils.sh (test_locale): Corrected
generation of the locale src file name.
------------------------
# ./[EMAIL PROTECTED] -d
RWSTD_SRC_ROOT=/usr/src/WorkingCopy/etc/nls
export RWSTD_SRC_ROOT
RWSTD_LOCALE_ROOT=/tmp/locale.8599
export RWSTD_LOCALE_ROOT
./localedef -w -c -f /usr/src/WorkingCopy/etc/nls/charmaps/ISO-8859-5
-i /usr/src/WorkingCopy/etc/nls/src/[EMAIL PROTECTED]
/tmp/locale.8599/[EMAIL PROTECTED] 2>/dev/tty
Error 500: /usr/src/WorkingCopy/etc/nls/src/[EMAIL PROTECTED] could not
be opened for reading
Error - localedef returned code: 4
------------------------
Farid.
