From patchwork Fri Jan 26 11:04:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 25574 Received: (qmail 111232 invoked by alias); 26 Jan 2018 11:05:46 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 111093 invoked by uid 89); 26 Jan 2018 11:05:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=HX-Received:10.223.151.143 X-HELO: mail-wr0-f175.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:organization:date:message-id :user-agent:mime-version:content-disposition; bh=upNrx0ERRUSVvqa9tQZMqjQWPHRXfHCIy4fwXsYQPP0=; b=OWL8P6z94TJhqBffxkUDOQ+LHgihT8omNSBnmIUK6GdQUqMsyMhbHUPxuLT4F12IsI KMNKZgEhfk/Xr0uh69I6yDGDiEUXXyHO2wZvbBn7f1lgG0jHZdRHTx47D595RBD1JuZK uBBQTlK4hv4xY652+c1L6nNXdazkMJVvIMBvzOZdRs2NfwxvkP7R72ullsyJrNtrE44k vdiKnN8hr9zMuQjR94xfMw/vU15llAS9ysJcqh1vr+0yWL7V3Fn3kIrYtaOZuJXo0DIa pTMS64ysh/tTeBULRZbv/CiUkeC8N5X5OwEcxH5T0SFeNLtIMFNoOTS6mjF2D6rklgCU wo/A== X-Gm-Message-State: AKwxytfurMIabgpwJBbIfUe0KsQGTJLs0IVtMKx9+Kk4/ls5b2E5sV4e nMrwe5uJZtGchhF0Kq13RLRY X-Google-Smtp-Source: AH8x225lYJvgzeEPJZuWToJNNa2IGJYWhDzqy2gmyIrHjOA+iw57pKhmYoZZkgThla9ZFBb11/sBSg== X-Received: by 10.223.151.143 with SMTP id s15mr12178105wrb.270.1516964696600; Fri, 26 Jan 2018 03:04:56 -0800 (PST) From: Mike FABIAN To: libc-alpha@sourceware.org Subject: [Patch 11/13] [BZ #14095] update collation data from Unicode / ISO 14651 Date: Fri, 26 Jan 2018 12:04:55 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Disposition: inline; filename=0011-Improve-gen-locales.mk-and-gen-locale.sh-to-make-tes.patch From c5301757fae76fa3f838f50f3b2ab84dfe05b782 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Mon, 1 Jan 2018 15:33:50 +0100 Subject: [PATCH 11/13] Improve gen-locales.mk and gen-locale.sh to make test files with @ options work 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. --- gen-locales.mk | 4 ++-- localedata/gen-locale.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gen-locales.mk b/gen-locales.mk index fd88b5bef1..9c523d2a05 100644 --- a/gen-locales.mk +++ b/gen-locales.mk @@ -1,8 +1,8 @@ # 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)" | \ - 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)) gen-locales := $(addprefix $(common-objpfx)localedata/,$(CTYPE_FILES)) diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh index 1bba5fee92..b91e42af13 100644 --- a/localedata/gen-locale.sh +++ b/localedata/gen-locale.sh @@ -49,7 +49,8 @@ generate_locale () locfile=`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..." @@ -73,4 +74,4 @@ if [ "$charmap_real" = 'SHIFT_JIS' ] \ flags="$flags --no-warnings=ascii" fi -generate_locale $charmap_real $locale $locale.$charmap "$flags" +generate_locale $charmap_real $locale$modifier $locale.$charmap$modifier "$flags" -- 2.14.3