From patchwork Fri Feb 23 10:25:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 877032 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-90525-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="cT6soeJS"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3znnRX2XK2z9sW0 for ; Fri, 23 Feb 2018 21:25:28 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type; q=dns; s=default; b=D1yvNxj+4Qf3fnLV ZdbXPC1pNe+6S7re5WzUQbJ+CTrO1peqnr8ktEGM2Qcl7KJJ21GNwon/olfHCSSC a2A1+RK7Mp+dfu8rW8iampQgtqTYhWt92sNDVA/iPVrzeYbAwBQG0kEA/E1i3DRl wDZKL5NyM0mobeZLVfhABFgOVa0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type; s=default; bh=CL8+rUAXjMr+8ONlRU8PoM gIwiw=; b=cT6soeJSSlzozY22UBJvB85wEJjMMmV6KyPEHISfVgQPVUDvgcSScN wWmVp0vDc+IJztZRbI/T8YfSE8UKDq0hOGf74uCO+IzoCA8jfX0cv8P8DWcztLQu SBuS2Mj9o+SsC2IJMOCMUo2FVSOFwQMSZt5GuJlAWhEXDIY/XZVUg= Received: (qmail 87271 invoked by alias); 23 Feb 2018 10:25:23 -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 87235 invoked by uid 89); 23 Feb 2018 10:25:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=Hx-languages-length:2232 X-HELO: mail-wr0-f173.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:cc:subject:organization:date:message-id :user-agent:mime-version:content-disposition; bh=Ji+Bowhqc2l5/YhLUxt+stcx2F/YChWeZHKCjxQ/Qww=; b=FtEyOGxGknMM4ed5dkchRp8vo+EIlkH10j2fNuN6Su3fZQfMN5Ib000FfyXOQ44bL2 n/FXjCDGwbeglfeFzIIO1TfqVr3bGYizmK98PgJ+o0iY6orD9jvyYD8y0Ms7AGCe494G XFKqUzaAdtayeRBcYzt9sdYhbQMpggAczjH6Ib7758AB5PynQqegJ30AitcEQVF4wSxH mnct6Qs7gmgoz6Y0QDiYzgzU5zsmuGM6BOeZJICodPyUf4AHNVw5SDfKpCyLT4IruDWZ DGjq69iGRWj27jVcriO9G52QnEblmoGR9uaNrwuZLo0PbEw8uuiU8Z6McZHzRjjmR/7Y VJcg== X-Gm-Message-State: APf1xPAW/MzyTmKFuH+sll/G2tIYTvdt61Xuo99vNedOIjUuquAx0U2d 0+ytOvSLjxL9fq5PqguVmnSp X-Google-Smtp-Source: AH8x224BnZe03j51duH/mRi+UCOT0SlBjWHAJiaVk99Uaxd7kYS+Um+ys1NrMPZUVuDsB3jULIPJQg== X-Received: by 10.223.153.51 with SMTP id x48mr1073875wrb.216.1519381519282; Fri, 23 Feb 2018 02:25:19 -0800 (PST) From: Mike FABIAN To: libc-alpha@sourceware.org Cc: "Dmitry V. Levin" Subject: [Patch v3 12/14] [BZ #14095] update collation data from Unicode / ISO 14651 Date: Fri, 23 Feb 2018 11:25:18 +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=0012-Improve-gen-locales.mk-and-gen-locale.sh-to-make-tes.patch Reviewed-by: Carlos O'Donell From c4eb0d236aab74f2b42f20bf2edb7ae48ce2ef81 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Mon, 1 Jan 2018 15:33:50 +0100 Subject: [PATCH 12/14] 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