mirror of
https://gitlab.freedesktop.org/xorg/lib/libx11.git
synced 2026-05-08 17:19:01 +02:00
Make locale data build non-recursive / parallelizable
On a 4 core CPU with gmake -j 16 the nls subdir builds in half the time, plus this simplifies the next set of changes. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: James Cloos <cloos@jhcloos.com> Tested-by: Gaetan Nadon <memsize@videotron.ca>
This commit is contained in:
Alan Coopersmith
parent
a3fc78ac35
commit
3eb0640716
64 changed files with 28 additions and 256 deletions
62
configure.ac
62
configure.ac
|
|
@ -67,7 +67,7 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then
|
|||
fi
|
||||
AC_SUBST(LDFLAGS_FOR_BUILD)
|
||||
|
||||
# Find perl for "make check" tests in nls/localerules.in
|
||||
# Find perl for "make check" tests in nls/Makefile.am
|
||||
AC_ARG_WITH(perl,
|
||||
AC_HELP_STRING([--with-perl=<path>],
|
||||
[path to perl interpreter for build-time tests]),
|
||||
|
|
@ -462,66 +462,6 @@ AC_OUTPUT([Makefile
|
|||
modules/om/generic/Makefile
|
||||
src/xkb/Makefile
|
||||
nls/Makefile
|
||||
nls/am_ET.UTF-8/Makefile
|
||||
nls/armscii-8/Makefile
|
||||
nls/C/Makefile
|
||||
nls/el_GR.UTF-8/Makefile
|
||||
nls/en_US.UTF-8/Makefile
|
||||
nls/fi_FI.UTF-8/Makefile
|
||||
nls/georgian-academy/Makefile
|
||||
nls/georgian-ps/Makefile
|
||||
nls/ibm-cp1133/Makefile
|
||||
nls/iscii-dev/Makefile
|
||||
nls/isiri-3342/Makefile
|
||||
nls/iso8859-1/Makefile
|
||||
nls/iso8859-10/Makefile
|
||||
nls/iso8859-11/Makefile
|
||||
nls/iso8859-13/Makefile
|
||||
nls/iso8859-14/Makefile
|
||||
nls/iso8859-15/Makefile
|
||||
nls/iso8859-2/Makefile
|
||||
nls/iso8859-3/Makefile
|
||||
nls/iso8859-4/Makefile
|
||||
nls/iso8859-5/Makefile
|
||||
nls/iso8859-6/Makefile
|
||||
nls/iso8859-7/Makefile
|
||||
nls/iso8859-8/Makefile
|
||||
nls/iso8859-9/Makefile
|
||||
nls/iso8859-9e/Makefile
|
||||
nls/ja/Makefile
|
||||
nls/ja.JIS/Makefile
|
||||
nls/ja_JP.UTF-8/Makefile
|
||||
nls/ja.S90/Makefile
|
||||
nls/ja.SJIS/Makefile
|
||||
nls/ja.U90/Makefile
|
||||
nls/ko/Makefile
|
||||
nls/koi8-c/Makefile
|
||||
nls/koi8-r/Makefile
|
||||
nls/koi8-u/Makefile
|
||||
nls/ko_KR.UTF-8/Makefile
|
||||
nls/microsoft-cp1251/Makefile
|
||||
nls/microsoft-cp1255/Makefile
|
||||
nls/microsoft-cp1256/Makefile
|
||||
nls/mulelao-1/Makefile
|
||||
nls/nokhchi-1/Makefile
|
||||
nls/pt_BR.UTF-8/Makefile
|
||||
nls/ru_RU.UTF-8/Makefile
|
||||
nls/tatar-cyr/Makefile
|
||||
nls/th_TH/Makefile
|
||||
nls/th_TH.UTF-8/Makefile
|
||||
nls/tscii-0/Makefile
|
||||
nls/vi_VN.tcvn/Makefile
|
||||
nls/vi_VN.viscii/Makefile
|
||||
nls/zh_CN/Makefile
|
||||
nls/zh_CN.gb18030/Makefile
|
||||
nls/zh_CN.gbk/Makefile
|
||||
nls/zh_CN.UTF-8/Makefile
|
||||
nls/zh_HK.big5/Makefile
|
||||
nls/zh_HK.big5hkscs/Makefile
|
||||
nls/zh_HK.UTF-8/Makefile
|
||||
nls/zh_TW/Makefile
|
||||
nls/zh_TW.big5/Makefile
|
||||
nls/zh_TW.UTF-8/Makefile
|
||||
specs/Makefile
|
||||
specs/i18n/Makefile
|
||||
specs/i18n/framework/Makefile
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/C
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -11,7 +11,7 @@ CLEANFILES= \
|
|||
locale.dir locale.dir.l1 locale.dir.l2 \
|
||||
XLC_LOCALE
|
||||
|
||||
SUBDIRS= \
|
||||
locales = \
|
||||
am_ET.UTF-8 \
|
||||
armscii-8 \
|
||||
C \
|
||||
|
|
@ -75,6 +75,8 @@ SUBDIRS= \
|
|||
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
# Global data files
|
||||
|
||||
locale.alias: locale.alias.pre
|
||||
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1
|
||||
sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
|
||||
|
|
@ -92,3 +94,21 @@ locale.dir: locale.dir.pre
|
|||
sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
|
||||
< locale.dir.l1 > locale.dir.l2
|
||||
cat locale.dir.l2 locale.dir.l1 > locale.dir
|
||||
|
||||
# Per-locale data files
|
||||
|
||||
nobase_dist_x11locale_DATA = $(locales:%=%/XI18N_OBJS)
|
||||
|
||||
nobase_x11locale_DATA = $(locales:%=%/XLC_LOCALE) $(locales:%=%/Compose)
|
||||
EXTRA_DIST += $(nobase_x11locale_DATA:%=%.pre)
|
||||
CLEANFILES += $(nobase_x11locale_DATA)
|
||||
|
||||
$(nobase_x11locale_DATA): builddirs
|
||||
|
||||
builddirs:
|
||||
$(MKDIR_P) $(locales)
|
||||
|
||||
if HAVE_PERL
|
||||
TESTS_ENVIRONMENT = $(PERL)
|
||||
TESTS = $(srcdir)/compose-check.pl
|
||||
endif HAVE_PERL
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/am_ET.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/armscii-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -34,10 +34,15 @@ use warnings;
|
|||
my $error_count = 0;
|
||||
|
||||
if (scalar(@ARGV) == 0) {
|
||||
push @ARGV, "Compose";
|
||||
if ( -f 'Compose' ) {
|
||||
push @ARGV, 'Compose';
|
||||
} else {
|
||||
push @ARGV, glob '*/Compose';
|
||||
}
|
||||
}
|
||||
|
||||
foreach my $cf (@ARGV) {
|
||||
# print "Checking $cf\n";
|
||||
$error_count += check_compose_file($cf);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/el_GR.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/en_US.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/fi_FI.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-academy
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-ps
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ibm-cp1133
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iscii-dev
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/isiri-3342
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-1
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-10
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-11
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-13
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-14
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-15
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-2
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-3
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-4
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-5
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-6
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-7
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9e
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ja.JIS
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ja.S90
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ja.SJIS
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ja.U90
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ja
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ja_JP.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ko
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ko_KR.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-c
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-r
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-u
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
EXTRA_DIST = XLC_LOCALE.pre Compose.pre
|
||||
|
||||
dist_x11thislocale_DATA = XI18N_OBJS
|
||||
x11thislocale_DATA = XLC_LOCALE Compose
|
||||
|
||||
CLEANFILES = XLC_LOCALE Compose
|
||||
|
||||
if HAVE_PERL
|
||||
TESTS_ENVIRONMENT = $(PERL)
|
||||
TESTS = $(top_srcdir)/nls/compose-check.pl
|
||||
endif HAVE_PERL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1251
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1255
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1256
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/mulelao-1
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/nokhchi-1
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/pt_BR.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/tatar-cyr
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/tscii-0
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.tcvn
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.viscii
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gb18030
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gbk
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5hkscs
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.UTF-8
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.big5
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW
|
||||
|
||||
include $(top_srcdir)/nls/localerules.in
|
||||
Loading…
Add table
Reference in a new issue