From 52ffb7ff0c002026d6ab13585c7459861b59bf9d Mon Sep 17 00:00:00 2001 From: John Marino Date: Sun, 2 Aug 2015 16:50:26 +0200 Subject: [PATCH] unbreak 4 LC categories My regular expression was wrong and all the comments were not getting stripped. This broke LC_MONETARY, LC_NUMERIC, LC_MESSAGES, and LC_TIMEDEF. Fix cldr2def tool and regenerate makefiles. --- share/monetdef/Makefile | 2 +- share/msgdef/Makefile | 2 +- share/numericdef/Makefile | 2 +- share/timedef/Makefile | 2 +- tools/tools/locale/tools/cldr2def.pl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile index b6f3f4ce8d..4783f4d5d1 100644 --- a/share/monetdef/Makefile +++ b/share/monetdef/Makefile @@ -6,7 +6,7 @@ FILESNAME= LC_MONETARY .SUFFIXES: .src .out .src.out: - grep -v -E '^#[ ]?$$' < ${.IMPSRC} > ${.TARGET} + grep -v -E '^(#$$|#[ ])' < ${.IMPSRC} > ${.TARGET} LOCALES+= af_ZA.ISO8859-1 LOCALES+= af_ZA.UTF-8 diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index b676ea5b59..e360d6af3b 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -6,7 +6,7 @@ FILESNAME= LC_MESSAGES .SUFFIXES: .src .out .src.out: - grep -v -E '^#[ ]?$$' < ${.IMPSRC} > ${.TARGET} + grep -v -E '^(#$$|#[ ])' < ${.IMPSRC} > ${.TARGET} LOCALES+= af_ZA.ISO8859-1 LOCALES+= am_ET.UTF-8 diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile index 7336273540..3ab6186dc6 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -6,7 +6,7 @@ FILESNAME= LC_NUMERIC .SUFFIXES: .src .out .src.out: - grep -v -E '^#[ ]?$$' < ${.IMPSRC} > ${.TARGET} + grep -v -E '^(#$$|#[ ])' < ${.IMPSRC} > ${.TARGET} LOCALES+= af_ZA.ISO8859-1 LOCALES+= af_ZA.UTF-8 diff --git a/share/timedef/Makefile b/share/timedef/Makefile index 2197800464..9ed95418e6 100644 --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -6,7 +6,7 @@ FILESNAME= LC_TIME .SUFFIXES: .src .out .src.out: - grep -v -E '^#[ ]?$$' < ${.IMPSRC} > ${.TARGET} + grep -v -E '^(#$$|#[ ])' < ${.IMPSRC} > ${.TARGET} LOCALES+= af_ZA.ISO8859-1 LOCALES+= am_ET.UTF-8 diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index db6af077e9..9aa26664fa 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -788,7 +788,7 @@ sub make_makefile { "locale/etc/final-maps\n"; } else { - $SRCOUT = "grep -v -E '^\#[ ]?\$\$' < \${.IMPSRC} > \${.TARGET}"; + $SRCOUT = "grep -v -E '^(\#\$\$|\#[ ])' < \${.IMPSRC} > \${.TARGET}"; $SRCOUT2 = "out"; } open(FOUT, ">$TYPE.draft/Makefile"); -- 2.11.4.GIT