From 04282c709b747b4de388d6d1ebffc29a6e636ff2 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 21 May 2009 13:50:40 +0000 Subject: merge bin-context into context git-svn-id: svn://tug.org/texlive/trunk@13353 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/tlpsrc/bin-context.tlpsrc | 49 ----------------------- Master/tlpkg/tlpsrc/collection-context.tlpsrc | 1 - Master/tlpkg/tlpsrc/context.tlpsrc | 56 ++++++++++++++++++++++++++- Master/tlpkg/tlpsrc/scheme-xml.tlpsrc | 1 - 4 files changed, 55 insertions(+), 52 deletions(-) delete mode 100644 Master/tlpkg/tlpsrc/bin-context.tlpsrc diff --git a/Master/tlpkg/tlpsrc/bin-context.tlpsrc b/Master/tlpkg/tlpsrc/bin-context.tlpsrc deleted file mode 100644 index e7adbcc0e55..00000000000 --- a/Master/tlpkg/tlpsrc/bin-context.tlpsrc +++ /dev/null @@ -1,49 +0,0 @@ -name bin-context -category TLCore -depend pdftex -execute AddFormat name=cont-en engine=pdftex patterns=cont-usr.tex options="-8bit *cont-en.ini" -execute AddFormat name=cont-cz mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-cz.ini" -execute AddFormat name=cont-de mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-de.ini" -execute AddFormat name=cont-nl mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-nl.ini" -execute AddFormat name=cont-uk mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-uk.ini" -execute AddFormat name=cont-en engine=xetex patterns=cont-usr.tex options="-8bit *cont-en.ini" -execute AddFormat name=mptopdf engine=pdftex options="-translate-file=cp227.tcx mptopdf.tex" -execute AddFormat name=metafun engine=mpost options="-translate-file=cp227.tcx metafun.mp" -runpattern f texmf-dist/tex/mptopdf/config/mptopdf.ini -docpattern f texmf/doc/man/man1/ctxtools.* -docpattern f texmf/doc/man/man1/makempy.* -docpattern f texmf/doc/man/man1/mptopdf.* -docpattern f texmf/doc/man/man1/pdftools.* -docpattern f texmf/doc/man/man1/pstopdf.* -docpattern f texmf/doc/man/man1/texexec.* -docpattern f texmf/doc/man/man1/texfind.* -docpattern f texmf/doc/man/man1/texfont.* -docpattern f texmf/doc/man/man1/texmfstart.* -docpattern f texmf/doc/man/man1/textools.* -docpattern f texmf/doc/man/man1/texutil.* -binpattern f bin/${ARCH}/context -binpattern f bin/${ARCH}/ctxtools -binpattern f bin/${ARCH}/exatools -binpattern f bin/${ARCH}/luatools -binpattern f bin/${ARCH}/makempy -binpattern f bin/${ARCH}/metafun -binpattern f bin/${ARCH}/mpstools -binpattern f bin/${ARCH}/mptopdf -binpattern f bin/${ARCH}/mtxrun -binpattern f bin/${ARCH}/mtxtools -binpattern f bin/${ARCH}/pdftools -binpattern f bin/${ARCH}/pdftrimwhite -binpattern f bin/${ARCH}/pstopdf -binpattern f bin/${ARCH}/rlxtools -binpattern f bin/${ARCH}/runtools -binpattern f bin/${ARCH}/texexec -binpattern f bin/${ARCH}/texfind -binpattern f bin/${ARCH}/texfont -binpattern f bin/${ARCH}/texmfstart -binpattern f bin/${ARCH}/texshow -binpattern f bin/${ARCH}/textools -binpattern f bin/${ARCH}/texutil -binpattern f bin/${ARCH}/tmftools -binpattern f bin/${ARCH}/xmltools -binpattern f bin/win32/luatools.lua -binpattern f bin/win32/mtxrun.lua diff --git a/Master/tlpkg/tlpsrc/collection-context.tlpsrc b/Master/tlpkg/tlpsrc/collection-context.tlpsrc index d490908e956..0021794a0cc 100644 --- a/Master/tlpkg/tlpsrc/collection-context.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-context.tlpsrc @@ -6,7 +6,6 @@ longdesc Also includes third-party ConTeXt packages. depend context depend jmn depend lmextra -depend bin-context depend context-account depend context-bnf depend context-chromato diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc index 366ae43b40d..6b9c4ca5ba7 100644 --- a/Master/tlpkg/tlpsrc/context.tlpsrc +++ b/Master/tlpkg/tlpsrc/context.tlpsrc @@ -1,20 +1,74 @@ name context category Package -depend bin-context +depend pdftex depend lm +execute AddFormat name=cont-en engine=pdftex patterns=cont-usr.tex options="-8bit *cont-en.ini" +execute AddFormat name=cont-cz mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-cz.ini" +execute AddFormat name=cont-de mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-de.ini" +execute AddFormat name=cont-nl mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-nl.ini" +execute AddFormat name=cont-uk mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-uk.ini" +execute AddFormat name=cont-en engine=xetex patterns=cont-usr.tex options="-8bit *cont-en.ini" +execute AddFormat name=mptopdf engine=pdftex options="-translate-file=cp227.tcx mptopdf.tex" +execute AddFormat name=metafun engine=mpost options="-translate-file=cp227.tcx metafun.mp" +# +# runpattern runpattern +d texmf-dist/context/config runpattern +d texmf-dist/context/data runpattern +d texmf-dist/fonts/cid/fontforge +runpattern +f texmf-dist/tex/mptopdf/config/mptopdf.ini # # these have their own TL packages, and are not part of core context. runpattern +!d texmf-dist/tex/context/third runpattern +!d texmf-dist/tex/context/interface/third runpattern +!d texmf-dist/scripts/context/lua/third runpattern +!d texmf-dist/metapost/context/third +# +# srcpattern srcpattern +!d texmf-dist/source/context/third +# +# docpattern docpattern +!d texmf-dist/doc/context/third +docpattern +f texmf/doc/man/man1/ctxtools.* +docpattern +f texmf/doc/man/man1/makempy.* +docpattern +f texmf/doc/man/man1/mptopdf.* +docpattern +f texmf/doc/man/man1/pdftools.* +docpattern +f texmf/doc/man/man1/pstopdf.* +docpattern +f texmf/doc/man/man1/texexec.* +docpattern +f texmf/doc/man/man1/texfind.* +docpattern +f texmf/doc/man/man1/texfont.* +docpattern +f texmf/doc/man/man1/texmfstart.* +docpattern +f texmf/doc/man/man1/textools.* +docpattern +f texmf/doc/man/man1/texutil.* # #docpattern +!d texmf-dist/fonts/misc/xetex/fontmapping/context # # should be fixed in next release: runpattern +!d texmf-dist/tex/context/pgf +# +# binpattern +binpattern f bin/${ARCH}/context +binpattern f bin/${ARCH}/ctxtools +binpattern f bin/${ARCH}/exatools +binpattern f bin/${ARCH}/luatools +binpattern f bin/${ARCH}/makempy +binpattern f bin/${ARCH}/metafun +binpattern f bin/${ARCH}/mpstools +binpattern f bin/${ARCH}/mptopdf +binpattern f bin/${ARCH}/mtxrun +binpattern f bin/${ARCH}/mtxtools +binpattern f bin/${ARCH}/pdftools +binpattern f bin/${ARCH}/pdftrimwhite +binpattern f bin/${ARCH}/pstopdf +binpattern f bin/${ARCH}/rlxtools +binpattern f bin/${ARCH}/runtools +binpattern f bin/${ARCH}/texexec +binpattern f bin/${ARCH}/texfind +binpattern f bin/${ARCH}/texfont +binpattern f bin/${ARCH}/texmfstart +binpattern f bin/${ARCH}/texshow +binpattern f bin/${ARCH}/textools +binpattern f bin/${ARCH}/texutil +binpattern f bin/${ARCH}/tmftools +binpattern f bin/${ARCH}/xmltools +binpattern f bin/win32/luatools.lua +binpattern f bin/win32/mtxrun.lua diff --git a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc b/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc index a72436c1ae2..46bf48f5ddb 100644 --- a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc +++ b/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc @@ -18,7 +18,6 @@ depend ucs depend wasy depend wasysym depend xmltex -depend bin-context depend collection-basic depend collection-fontsrecommended depend collection-latex -- cgit v1.2.3