Martin Sebor wrote:
> Martin Sebor wrote:
>> Farid Zaripov wrote:
>>
>>>   Attached is a patch for run_locale_utils.sh script. If locale name
>>> is like lang_enc@sublang then locale src file name should be
>>> lang.sublang instead of lang@sublang.
>>
>>
>> IIRC, this was to accommodate older versions of the Perforce server
>> which didn't permit the '@' character in file names. Since we aren't
>> using Perforce (and since there is a Perforce update that deals with
>> the at sign) we probably shouldn't be doing this mapping anymore.
> 
> So I guess the other option, if we decide not to do the name
> transformation, is to rename the locale source files in svn,
> correct? If that's all that needs to be done I can take care
> of it tomorrow. Let me know.

If you update the file names, I believe the etc/nls/gen_list file will 
also need to be updated, as it includes references to the files that 
would be renamed.

--Andrew Black

> 
> Martin
> 
>>
>> Martin
>>
>>>
>>>   ChangeLog:
>>>   * run_locale_utils.sh (test_locale): Corrected
>>>   generation of the locale src file name.
>>>
>>> ------------------------
>>> # ./sr_YU.ISO-8859-5@cyrillic.sh -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/sr_YU@cyrillic 
>>> /tmp/locale.8599/sr_YU.ISO-8859-5@cyrillic 2>/dev/tty
>>> Error 500: /usr/src/WorkingCopy/etc/nls/src/sr_YU@cyrillic could not 
>>> be opened for reading
>>> Error - localedef returned code: 4
>>> ------------------------
>>>
>>>
>>> Farid.
>>>
>>>
>>> ------------------------------------------------------------------------
>>>
>>> Index: run_locale_utils.sh
>>> ===================================================================
>>> --- run_locale_utils.sh    (revision 432164)
>>> +++ run_locale_utils.sh    (working copy)
>>> @@ -232,7 +232,7 @@
>>>  
>>>      # get locale's name and encoding
>>>      locale_src=`echo $3 | \
>>> -                sed -n 
>>> "s:\([^\.]*\)\.\([^\.\@]*\)\(.*\):\1\3:p;s:\@$::g"`;
>>> +                sed -n "s:\([^\.]*\)\.\([^\.\@]*\)\(.*\):\1\3:p" | 
>>> tr "@" "."`;
>>>      locale_encoding=`echo $3 | \
>>>                       sed -n "s:\([^\.]*\)\.\([^\.\@]*\)\(.*\):\2:p"`;
>>>  
>>
>>
>