From patchwork Mon Feb 26 15:11:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 877941 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-90591-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="tGRh6FL1"; 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 3zqlfj1yC9z9s19 for ; Tue, 27 Feb 2018 02:11:57 +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=ih1SuGlu9rmcK6Ng UQ6xjJf/kTuMR2CeOIbdA5EJU1vzOZiArhrmM3juphBgdFayVLcxq0xZVZLxo9ZP flRW0BXCjVo/E/Z9Bh51N+3DzIu5DDDhfFq9bVnk1Z85NXJWI7oqO57qPcPc3xJj sRyYlOlUeeLu8ntwEuPhPmtBYUs= 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=Ky/9pwn/TPt+Nlc+GNjv1w nEh1A=; b=tGRh6FL1YNAobfOcBHEpiEeblCGrVXve8M9zBl0xBYT6Vc++KBSlGs 60A1fyo85viyC+/JX5w/vlMOKkXRFc8GS1X60TG3/hLliWQH0f9EBHMYtJs7Ezq1 V7G+0L/r3LJRgUGabVIt0+1JEd5Oq3WTiSqZ5FMbZiCVnhm9PorAo= Received: (qmail 128551 invoked by alias); 26 Feb 2018 15:11:51 -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 128197 invoked by uid 89); 26 Feb 2018 15:11:51 -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= X-HELO: mail-wr0-f179.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=l4UrQIiahp+XlbXQVCHkK6Iv/uKGC1patduyFWGX/yk=; b=t7/jW/iwxe43PtVapO+wabJ6ZzPI8wj1k/UjGoC3zud6HG/9BDK7ADDTpKth2q5z5v cRH0pjYpwgkDRDQhq1c/SNnmRCrCsSg4zpnUE26v+9uq8sOJRcvvELJ4ogRZhJw4vqer XShHGH7DFhouGeuJdIu7zpdk/mwMa4X8KUk62yPwyaaVQuVZinpWLrQgdEwxSjifAtQl aMJlBGU7sJBGzG2nJXe17az0eh+UqTBRqg5XdAKFWiWruw1DLaNrKV7p6B/YZV6KWFUi Js4CZYX7g8TdLxHlACCkbX0z8+ObHqUAj9Hn2840//jeRQk2lMBUa9jSROpdmmKSMcns N+yA== X-Gm-Message-State: APf1xPCLzH9vmkKihpSHSQNdLZURnHFG2Wejn+qVln2+/Y4CWZFobSq4 iox7KJndx9RvwEoyndhfE5R/ X-Google-Smtp-Source: AH8x224RusL0La+opNA0f0MHisk8czfD9M1Xc8+m1fvqnAG+1fLvxP97d+7PZsB7AbX0rS0Pjn5V9w== X-Received: by 10.223.163.16 with SMTP id c16mr9456485wrb.18.1519657906800; Mon, 26 Feb 2018 07:11:46 -0800 (PST) From: Mike FABIAN To: libc-alpha@sourceware.org Cc: "Dmitry V. Levin" Subject: [Patch v4 12/14] [BZ #14095] update collation data from Unicode / ISO 14651 Date: Mon, 26 Feb 2018 16:11:45 +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 8ca62eb521ef3e540fecfbe5574f64cad42d9d07 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