From 4703c93aaecf0d5794eca723cd5b1b72b04d04ee Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 20 Jun 2011 09:33:04 +0200 Subject: libX11 xserver mesa git update 20 June 2011 --- libX11/nls/Makefile.am | 285 ++++++++++++++++++++++++----------------------- libX11/nls/xmlrules.in | 59 ++++++++++ libX11/specs/xmlrules.in | 126 ++++++++++----------- 3 files changed, 262 insertions(+), 208 deletions(-) create mode 100644 libX11/nls/xmlrules.in (limited to 'libX11') diff --git a/libX11/nls/Makefile.am b/libX11/nls/Makefile.am index cf7971ff7..cabaf40e1 100644 --- a/libX11/nls/Makefile.am +++ b/libX11/nls/Makefile.am @@ -1,141 +1,144 @@ - -x11localedir = $(X11_LOCALEDATADIR) -specdir = $(docdir)/Compose - -include $(top_srcdir)/specs/xmlrules.in - -EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \ - compose-check.pl compose-chart.pl - -x11locale_DATA = locale.alias locale.dir compose.dir - -CLEANFILES += \ - locale.alias locale.alias.l1 locale.alias.l2 \ - compose.dir compose.dir.l1 compose.dir.l2 \ - locale.dir locale.dir.l1 locale.dir.l2 \ - XLC_LOCALE - -locales = \ - am_ET.UTF-8 \ - armscii-8 \ - C \ - el_GR.UTF-8 \ - en_US.UTF-8 \ - fi_FI.UTF-8 \ - georgian-academy \ - georgian-ps \ - ibm-cp1133 \ - iscii-dev \ - isiri-3342 \ - iso8859-1 \ - iso8859-10 \ - iso8859-11 \ - iso8859-13 \ - iso8859-14 \ - iso8859-15 \ - iso8859-2 \ - iso8859-3 \ - iso8859-4 \ - iso8859-5 \ - iso8859-6 \ - iso8859-7 \ - iso8859-8 \ - iso8859-9 \ - iso8859-9e \ - ja \ - ja.JIS \ - ja_JP.UTF-8 \ - ja.S90 \ - ja.SJIS \ - ja.U90 \ - ko \ - koi8-c \ - koi8-r \ - koi8-u \ - ko_KR.UTF-8 \ - microsoft-cp1251 \ - microsoft-cp1255 \ - microsoft-cp1256 \ - mulelao-1 \ - nokhchi-1 \ - pt_BR.UTF-8 \ - ru_RU.UTF-8 \ - tatar-cyr \ - th_TH \ - th_TH.UTF-8 \ - tscii-0 \ - vi_VN.tcvn \ - vi_VN.viscii \ - zh_CN \ - zh_CN.gb18030 \ - zh_CN.gbk \ - zh_CN.UTF-8 \ - zh_HK.big5 \ - zh_HK.big5hkscs \ - zh_HK.UTF-8 \ - zh_TW \ - zh_TW.big5 \ - zh_TW.UTF-8 - -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' \ - < locale.alias.l1 > locale.alias.l2 - cat locale.alias.l2 locale.alias.l1 > locale.alias - -compose.dir: compose.dir.pre - $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1 - sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ - < compose.dir.l1 > compose.dir.l2 - cat compose.dir.l2 compose.dir.l1 > compose.dir - -locale.dir: locale.dir.pre - $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1 - sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ - < locale.dir.l1 > locale.dir.l2 - cat locale.dir.l2 locale.dir.l1 > locale.dir - -if HAVE_PERL -doc_sources = Compose/index.xml - -Compose/index.xml: - @$(MKDIR_P) $(@D) - $(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \ - --index --output="$@" $(locales) - -clean-local: clean-Compose-dir -clean-Compose-dir: - -rm -rf Compose -endif HAVE_PERL - - -# 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) - -if HAVE_PERL -TESTS_ENVIRONMENT = $(PERL) -TESTS = $(srcdir)/compose-check.pl - -COMPOSE_CHARTS = $(locales:%=%/Compose.xml) -doc_sources += $(locales:%=Compose/%.xml) -CLEANFILES += $(COMPOSE_CHARTS) $(doc_sources) - -XMLTO_FLAGS += -o $(@D) - -%/Compose.xml: %/Compose - $(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \ - --locale="$(@D)" --output="$@" $< - -Compose/%.xml: %/Compose.xml - $(AM_V_GEN)cp $< $@ - -endif HAVE_PERL + +x11localedir = $(X11_LOCALEDATADIR) +specdir = $(docdir)/Compose +CLEANFILES = +XMLTO_FLAGS = +SUFFIXES = + +include $(top_srcdir)/nls/xmlrules.in + +EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \ + compose-check.pl compose-chart.pl + +x11locale_DATA = locale.alias locale.dir compose.dir + +CLEANFILES += \ + locale.alias locale.alias.l1 locale.alias.l2 \ + compose.dir compose.dir.l1 compose.dir.l2 \ + locale.dir locale.dir.l1 locale.dir.l2 \ + XLC_LOCALE + +locales = \ + am_ET.UTF-8 \ + armscii-8 \ + C \ + el_GR.UTF-8 \ + en_US.UTF-8 \ + fi_FI.UTF-8 \ + georgian-academy \ + georgian-ps \ + ibm-cp1133 \ + iscii-dev \ + isiri-3342 \ + iso8859-1 \ + iso8859-10 \ + iso8859-11 \ + iso8859-13 \ + iso8859-14 \ + iso8859-15 \ + iso8859-2 \ + iso8859-3 \ + iso8859-4 \ + iso8859-5 \ + iso8859-6 \ + iso8859-7 \ + iso8859-8 \ + iso8859-9 \ + iso8859-9e \ + ja \ + ja.JIS \ + ja_JP.UTF-8 \ + ja.S90 \ + ja.SJIS \ + ja.U90 \ + ko \ + koi8-c \ + koi8-r \ + koi8-u \ + ko_KR.UTF-8 \ + microsoft-cp1251 \ + microsoft-cp1255 \ + microsoft-cp1256 \ + mulelao-1 \ + nokhchi-1 \ + pt_BR.UTF-8 \ + ru_RU.UTF-8 \ + tatar-cyr \ + th_TH \ + th_TH.UTF-8 \ + tscii-0 \ + vi_VN.tcvn \ + vi_VN.viscii \ + zh_CN \ + zh_CN.gb18030 \ + zh_CN.gbk \ + zh_CN.UTF-8 \ + zh_HK.big5 \ + zh_HK.big5hkscs \ + zh_HK.UTF-8 \ + zh_TW \ + zh_TW.big5 \ + zh_TW.UTF-8 + +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' \ + < locale.alias.l1 > locale.alias.l2 + cat locale.alias.l2 locale.alias.l1 > locale.alias + +compose.dir: compose.dir.pre + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1 + sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ + < compose.dir.l1 > compose.dir.l2 + cat compose.dir.l2 compose.dir.l1 > compose.dir + +locale.dir: locale.dir.pre + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1 + sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ + < locale.dir.l1 > locale.dir.l2 + cat locale.dir.l2 locale.dir.l1 > locale.dir + +if HAVE_PERL +doc_sources = Compose/index.xml + +Compose/index.xml: + @$(MKDIR_P) $(@D) + $(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \ + --index --output="$@" $(locales) + +clean-local: clean-Compose-dir +clean-Compose-dir: + -rm -rf Compose +endif HAVE_PERL + + +# 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) + +if HAVE_PERL +TESTS_ENVIRONMENT = $(PERL) +TESTS = $(srcdir)/compose-check.pl + +COMPOSE_CHARTS = $(locales:%=%/Compose.xml) +doc_sources += $(locales:%=Compose/%.xml) +CLEANFILES += $(COMPOSE_CHARTS) $(doc_sources) + +XMLTO_FLAGS += -o $(@D) + +%/Compose.xml: %/Compose + $(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \ + --locale="$(@D)" --output="$@" $< + +Compose/%.xml: %/Compose.xml + $(AM_V_GEN)cp $< $@ + +endif HAVE_PERL diff --git a/libX11/nls/xmlrules.in b/libX11/nls/xmlrules.in new file mode 100644 index 000000000..5a6be24f5 --- /dev/null +++ b/libX11/nls/xmlrules.in @@ -0,0 +1,59 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +if HAVE_XMLTO +spec_DATA = $(doc_sources:.xml=.html) + +if HAVE_FOP +spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) +endif + +if HAVE_XMLTO_TEXT +spec_DATA += $(doc_sources:.xml=.txt) +endif + +if HAVE_STYLESHEETS +XMLTO_FLAGS += \ + -m $(XSL_STYLESHEET) \ + --stringparam img.src.path=$(abs_builddir)/ \ + --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css +endif + +CLEANFILES += $(spec_DATA) + +%.txt: %.xml $(dist_spec_DATA) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< + +%.html: %.xml $(dist_spec_DATA) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< + +%.pdf: %.xml $(dist_spec_DATA) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< + +%.ps: %.xml $(dist_spec_DATA) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< + +chunked-html: $(doc_sources) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) + +endif HAVE_XMLTO diff --git a/libX11/specs/xmlrules.in b/libX11/specs/xmlrules.in index b58ff5f08..8b105f334 100644 --- a/libX11/specs/xmlrules.in +++ b/libX11/specs/xmlrules.in @@ -1,67 +1,59 @@ -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - -CLEANFILES = -SUFFIXES = -XMLTO_FLAGS = - -if HAVE_XMLTO -spec_DATA = $(doc_sources:.xml=.html) - -if HAVE_FOP -spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -endif - -if HAVE_XMLTO_TEXT -spec_DATA += $(doc_sources:.xml=.txt) -endif - -if HAVE_STYLESHEETS -XMLTO_FLAGS += \ - -m $(XSL_STYLESHEET) \ - --stringparam img.src.path=$(abs_builddir)/ \ - --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css -endif - -CLEANFILES += $(spec_DATA) - -SUFFIXES += .xml .ps .pdf .txt .html - -%.txt: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -%.html: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -%.pdf: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -%.ps: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -chunked-html: $(doc_sources) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -CLEANFILES += html - -endif HAVE_XMLTO +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +if HAVE_XMLTO +spec_DATA = $(doc_sources:.xml=.html) + +if HAVE_FOP +spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) +endif + +if HAVE_XMLTO_TEXT +spec_DATA += $(doc_sources:.xml=.txt) +endif + +if HAVE_STYLESHEETS +XMLTO_FLAGS = \ + -m $(XSL_STYLESHEET) \ + --stringparam img.src.path=$(abs_builddir)/ \ + --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css +endif + +CLEANFILES = $(spec_DATA) + +%.txt: %.xml $(dist_spec_DATA) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< + +%.html: %.xml $(dist_spec_DATA) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< + +%.pdf: %.xml $(dist_spec_DATA) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< + +%.ps: %.xml $(dist_spec_DATA) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< + +chunked-html: $(doc_sources) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) + +endif HAVE_XMLTO -- cgit v1.2.3