sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 76645 by Arwed von Merkatz for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 76645 by Arwed von Merkatz for review
Date: Thu, 23 Mar 2006 21:10:06 +0000 (GMT)

Change 76645 by arwed_von_merkatz@arwed-Otherland on 2006/03/23 21:06:05

fix utf8 locale generation

Affected files ...

... //sgl/grimoires/devel/libs/locale/CONFIGURE#4 edit
... //sgl/grimoires/devel/libs/locale/DETAILS#10 edit
... //sgl/grimoires/devel/libs/locale/HISTORY#12 edit
... //sgl/grimoires/devel/libs/locale/INSTALL#3 edit

Differences ...

==== //sgl/grimoires/devel/libs/locale/CONFIGURE#4 (xtext) ====

@@ -1,4 +1,8 @@
-config_query LOCALE_UTF "Would you like to generate UTF-8 locale data
(Unicode) as well as the native charset data?" y
+if [ -z "$LOCAL_UTF" ]; then
+ LOCALE_UTF=${GLIBC_UTF:-y}
+fi &&
+config_query LOCALE_UTF "Would you like to generate UTF-8 locale data
(Unicode) as well as the native charset data?" y &&
+persistent_remove GLIBC_UTF &&
#
# Don't use config_query here or you'll regret it ;)
# If you do, after a user says 'y' to configuring the locales,
@@ -6,20 +10,27 @@
# locale is recast with `cast -r locale`, which would also remove
# the selected locales and you'd need to reconfigure them again...
#
+if [ -z "$LOCALE_LOCALES" ]; then
+ if [ "$GLIBC_LOCALES" ]; then
+ persistent_add LOCALE_LOCALES &&
+ LOCALE_LOCALES=${GLIBC_LOCALES}
+ fi
+fi &&
+persistent_remove GLIBC_LOCALES &&
if query "Would you like to select locales?" n; then
- local GLIBC_LOCALES_LIST &&
- persistent_add GLIBC_LOCALES &&
- GLIBC_LOCALES_LIST=`cat $SCRIPT_DIRECTORY/locales` &&
+ local LOCALE_LOCALES_LIST &&
+ persistent_add LOCALE_LOCALES &&
+ LOCALE_LOCALES_LIST=`cat $SCRIPT_DIRECTORY/locales` &&
BACKTITLE="Locale Configuration" &&
TITLE="Locale Selection" &&
HELP="Translated messages are automatically installed, but the locale
database that controls other behavior is not.
Please select desired locale or locales.
If none are selected then all will be installed." &&

- GLIBC_LOCALES=`dialog --backtitle "$BACKTITLE" \
+ LOCALE_LOCALES=`dialog --backtitle "$BACKTITLE" \
--title "$TITLE" \
--stdout \
--checklist "$HELP" \
0 0 0 \
- $GLIBC_LOCALES_LIST`
+ $LOCALE_LOCALES_LIST`
fi

==== //sgl/grimoires/devel/libs/locale/DETAILS#10 (xtext) ====

@@ -1,5 +1,5 @@
SPELL=locale
- VERSION=0.0.1
+ VERSION=0.0.2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.gnu.org/software/libc
LICENSE[0]=LGPL

==== //sgl/grimoires/devel/libs/locale/HISTORY#12 (text) ====

@@ -1,3 +1,9 @@
+2006-03-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated version to 0.0.2
+ * CONFIGURE, INSTALL: use LOCALE_ for all variable names instead of
+ GLIBC_, fixes utf8 locale generation as that used both,
+ default to old values of GLIBC_ variables, persistent_remove those
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/libs/locale/INSTALL#3 (xtext) ====

@@ -1,33 +1,33 @@
#
# generate the localedef file from installed specs
#
-local GLIBC_INPUTFILE GLIBC_CHARMAP GLIBC_LOCALE &&
-if [ -z "$GLIBC_LOCALES" ]; then
- local GLIBC_DESCRIPTION
&&
+local LOCALE_INPUTFILE LOCALE_CHARMAP LOCALE_LOCALE &&
+if [ -z "$LOCALE_LOCALES" ]; then
+ local LOCALE_DESCRIPTION
&&
cat $SCRIPT_DIRECTORY/locales |
- while read GLIBC_LOCALE GLIBC_DESCRIPTION; do
- GLIBC_INPUTFILE=`echo $GLIBC_LOCALE | cut -d / -f1`
&&
- GLIBC_CHARMAP=`echo $GLIBC_LOCALE | cut -d / -f2`
&&
- mkdir -p ${INSTALL_ROOT}/usr/lib/locale/$GLIBC_INPUTFILE
&&
- echo "localedef -f $GLIBC_CHARMAP -i $GLIBC_INPUTFILE
$GLIBC_INPUTFILE" \
- " $GLIBC_DESCRIPTION"
&&
- localedef --prefix=${INSTALL_ROOT} -i $GLIBC_INPUTFILE -f
$GLIBC_CHARMAP \
- $GLIBC_INPUTFILE
&&
- if [ "$GLIBC_UTF" = "y" ] &&
- ! [ "$GLIBC_CHARMAP" = "UTF-8" ]; then
- echo "localedef -f UTF-8 -i $GLIBC_INPUTFILE
$GLIBCINPUTFILE.UTF-8 $GLIBC_DESCRIPTION" \
+ while read LOCALE_LOCALE LOCALE_DESCRIPTION; do
+ LOCALE_INPUTFILE=`echo $LOCALE_LOCALE | cut -d / -f1`
&&
+ LOCALE_CHARMAP=`echo $LOCALE_LOCALE | cut -d / -f2`
&&
+ mkdir -p ${INSTALL_ROOT}/usr/lib/locale/$LOCALE_INPUTFILE
&&
+ echo "localedef -f $LOCALE_CHARMAP -i $LOCALE_INPUTFILE
$LOCALE_INPUTFILE" \
+ " $LOCALE_DESCRIPTION"
&&
+ localedef --prefix=${INSTALL_ROOT} -i $LOCALE_INPUTFILE -f
$LOCALE_CHARMAP \
+ $LOCALE_INPUTFILE
&&
+ if [ "$LOCALE_UTF" = "y" ] &&
+ ! [ "$LOCALE_CHARMAP" = "UTF-8" ]; then
+ echo "localedef -f UTF-8 -i $LOCALE_INPUTFILE
$GLIBCINPUTFILE.UTF-8 $LOCALE_DESCRIPTION" \
" (UNICODE Charset)"
&&
- localedef --prefix=${INSTALL_ROOT} -i $GLIBC_INPUTFILE -f UTF-8
$GLIBC_INPUTFILE.UTF-8
+ localedef --prefix=${INSTALL_ROOT} -i $LOCALE_INPUTFILE -f UTF-8
$LOCALE_INPUTFILE.UTF-8
fi
done || true
else
- for LOCALE in $GLIBC_LOCALES; do
+ for LOCALE in $LOCALE_LOCALES; do
INPUTFILE=`echo $LOCALE | cut -d / -f1`
&&
CHARMAP=`echo $LOCALE | cut -d / -f2`
&&
mkdir -p ${INSTALL_ROOT}/usr/lib/locale/$INPUTFILE
&&
echo "localedef -f $CHARMAP -i $INPUTFILE $INPUTFILE"
&&
localedef --prefix=${INSTALL_ROOT} -i $INPUTFILE -f $CHARMAP
$INPUTFILE &&
- if [ "$GLIBC_UTF" = "y" ] &&
+ if [ "$LOCALE_UTF" = "y" ] &&
! [ "$CHARMAP" = "UTF-8" ]; then
echo "localedef -f UTF-8 -i $INPUTFILE $INPUTFILE.UTF-8"
&&
localedef --prefix=${INSTALL_ROOT} -i $INPUTFILE -f UTF-8
$INPUTFILE.UTF-8

[SM-Commit] PERFORCE change 76645 by Arwed von Merkatz for review, Perforce Review Daemon, 03/23/2006