summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlpsrc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-23 20:32:38 +0000
committerKarl Berry <karl@freefriends.org>2019-12-23 20:32:38 +0000
commitc3e39e899206e8fa4dc6636f5e90c1f568634428 (patch)
treeabb9769b5ff0aa792ba6f85e5cab0a2e9b2f02f3 /Master/tlpkg/tlpsrc
parent8e0008903f054fd90b7f44ee8aaeb6b4dc6644a7 (diff)
allow global_tlpvars to be set in autopatterns and used across other packages; define globals for common dependencies; doc updates
git-svn-id: svn://tug.org/texlive/trunk@53216 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlpsrc')
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc32
-rw-r--r--Master/tlpkg/tlpsrc/eplain.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/luahbtex.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/luajittex.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/luatex.tlpsrc10
-rw-r--r--Master/tlpkg/tlpsrc/mflua.tlpsrc9
-rw-r--r--Master/tlpkg/tlpsrc/platex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/uplatex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/xmltex.tlpsrc2
11 files changed, 49 insertions, 36 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 14727c17383..6c1c7c5f6a2 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -1,11 +1,31 @@
category TLCore
shortdesc defines per-category patterns used by tlpsrc-to-tlpdb conversion
-longdesc As can be seen, the syntax here is slightly different than a
+longdesc As can be seen, the syntax here is rather different from a
longdesc normal tlpsrc file: an additional first argument specifies the
longdesc category for this pattern, and a final %NAME% is replaced with
-longdesc the package. Defining new categories merely by adding them
-longdesc here is not currently implemented, though it could be done if
-longdesc it proves useful. See the TeXLive::TLPSRC documentation for more.
+longdesc the package.
+longdesc
+longdesc In addition, global TLPSRC variables can be defined, which
+longdesc can be used in any .tlpsrc variable. Their names must start
+longdesc with "global_".
+longdesc
+longdesc Defining new categories merely by adding them here is not
+longdesc currently implemented, though it could be done if useful.
+longdesc
+longdesc See the TeXLive::TLPSRC documentation for more.
+
+# These packages are used by all LaTeX variants.
+# After the TL 2020 release, there should be more commonalities between
+# latex-bin and latex-bin-dev that we can add here.
+tlpsetvar global_latex_deps babel,cm,hyphen-base,latex-fonts
+#
+# These packages are used by all LuaTeX variants - luatex, luajittex, luahbtex.
+tlpsetvar global_luatex_deps cm,etex,hyphen-base,knuth-lib,plain,\
+tex-ini-files,unicode-data
+#
+# It would be ideal to be able to specify the non-jit platforms here,
+# but it's not crucial, so we haven't implemented ${global_} expansion
+# in binpatterns.
# auto patterns for category Package
runpattern Package t texmf-dist bibtex %NAME%
@@ -22,7 +42,9 @@ runpattern Package t texmf-dist tex %NAME%
runpattern Package d texmf-dist/tex/context/third/%NAME%
runpattern Package d texmf-dist/fonts/misc/xetex/fontmapping/%NAME%
runpattern Package d texmf-dist/scripts/context/lua/third/%NAME%
+#
srcpattern Package t texmf-dist source %NAME%
+#
docpattern Package t texmf-dist doc %NAME%
docpattern Package f texmf-dist/doc/man/man1/%NAME%.*
docpattern Package d texmf-dist/doc/context/third/%NAME%
@@ -43,5 +65,7 @@ runpattern ConTeXt f texmf-dist/tex/context/interface/third/t-%NAME%.xml
runpattern ConTeXt d texmf-dist/tex/context/third/%context-:NAME%
runpattern ConTeXt d texmf-dist/scripts/context/lua/third/%context-:NAME%
runpattern ConTeXt d texmf-dist/metapost/context/third/%context-:NAME%
+#
docpattern ConTeXt d texmf-dist/doc/context/third/%context-:NAME%
+#
srcpattern ConTeXt d texmf-dist/source/context/third/%context-:NAME%
diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc
index 105499c2940..6aaa41e4bd2 100644
--- a/Master/tlpkg/tlpsrc/eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc
@@ -1,7 +1,9 @@
depend pdftex
+# although eplain is not at all LaTeX, it loads Babel,
+# which turns out to be the same core LaTeX packages.
execute AddFormat name=eplain engine=pdftex patterns=language.dat \
options="-translate-file=cp227.tcx *eplain.ini" \
- fmttriggers=babel,cm,dehyph,hyphen-base,knuth-lib,latex-fonts,plain
+ fmttriggers=${global_latex_deps},dehyph,knuth-lib,plain
docpattern +f texmf-dist/doc/info/eplain.info
docpattern +f texmf-dist/doc/man/man1/eplain.*
binpattern f bin/${ARCH}/eplain
diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
index d16d306691f..150decb3a81 100644
--- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
@@ -14,8 +14,8 @@ depend latex-graphics-dev
docpattern f texmf-dist/doc/man/man1/*latex-dev.*
-# Keep these variables in sync with latex-bin.tlpsrc.
-tlpsetvar fmtcomm babel,cm,hyphen-base,l3kernel,latex-base-dev,latex-fonts,\
+# cf. latex-bin.tlpsrc.
+tlpsetvar fmtcomm ${global_latex_deps},l3kernel,latex-base-dev,\
tex-ini-files,unicode-data
#
tlpsetvar nonluafmtdeps dehyph,latexconfig
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index 323e59b6344..c388060f25d 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -1,12 +1,12 @@
category TLCore
shortdesc LaTeX executables and man pages
-#
+
# we must depend on latex, not the other way around, to ensure that all
# files are installed before we try to make the formats.
depend latex
-# Keep these variables in sync with latex-bin-dev.tlpsrc.
-tlpsetvar fmtcomm babel,cm,hyphen-base,latex,latex-fonts,tex-ini-files
+# cf. latex-bin-dev.tlpsrc.
+tlpsetvar fmtcomm ${global_latex_deps},latex,tex-ini-files
tlpsetvar nonluafmtdeps dehyph,latexconfig
tlpsetvar luafmtdeps unicode-data,luaotfload
diff --git a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
index eec52d3c8ea..07dfd2734c3 100644
--- a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
@@ -1,10 +1,6 @@
category TLCore
shortdesc LuaTeX with HarfBuzz library for glyph shaping
-# must keep in sync with luatex.tlpsrc.
-tlpsetvar fmtdeps cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,\
-unicode-data
-
# Until TL'20, we only have this for auto-built platforms and Windows,
# via /home/texlive/luahbtmp on tug.
#
@@ -21,7 +17,7 @@ binpattern f/!${no_luahb_platforms} bin/${ARCH}/luahbtex
execute AddFormat name=luahbtex engine=luahbtex \
patterns=language.def,language.dat.lua \
options="luatex.ini" \
- fmttriggers=${fmtdeps},luatex
+ fmttriggers=${global_luatex_deps},luatex
# can't have luahbtex without luatex.
depend luatex
diff --git a/Master/tlpkg/tlpsrc/luajittex.tlpsrc b/Master/tlpkg/tlpsrc/luajittex.tlpsrc
index 2ab2f194b9c..87558d84039 100644
--- a/Master/tlpkg/tlpsrc/luajittex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luajittex.tlpsrc
@@ -1,11 +1,7 @@
category TLCore
shortdesc LuaTeX with just-in-time (jit) compiler
-# must keep in sync with luatex.tlpsrc.
-tlpsetvar fmtdeps cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,\
-unicode-data
-
-# keep in sync with mflua.tlpsrc.
+# must keep in sync with mflua.tlpsrc.
tlpsetvar no_luajit_platforms x86_64-solaris
#
binpattern f/!${no_luajit_platforms} bin/${ARCH}/luajittex
@@ -23,7 +19,7 @@ binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygtexluajit*.dll
# invoked by specifications in TLConfig.pm and tlmgr.pl.
execute AddFormat name=luajittex engine=luajittex options="luatex.ini" \
patterns=language.def,language.dat.lua \
- fmttriggers=${fmtdeps},luatex
+ fmttriggers=${global_luatex_deps},luatex
# can't have luajittex without luatex.
depend luatex
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index 6b053ef5b68..9e361e32a34 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -1,16 +1,12 @@
category TLCore
-#
-# keep in sync with luajit.tlpsrc.
-tlpsetvar fmtdeps cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,\
-unicode-data
-#
+
execute AddFormat name=luatex engine=luatex options="luatex.ini" \
patterns=language.def,language.dat.lua \
- fmttriggers=${fmtdeps}
+ fmttriggers=${global_luatex_deps}
#
execute AddFormat name=dviluatex engine=luatex options="dviluatex.ini" \
patterns=language.def,language.dat.lua \
- fmttriggers=${fmtdeps}
+ fmttriggers=${global_luatex_deps}
#
docpattern d texmf-dist/doc/luatex/base
docpattern f texmf-dist/doc/man/man1/dviluatex.*
diff --git a/Master/tlpkg/tlpsrc/mflua.tlpsrc b/Master/tlpkg/tlpsrc/mflua.tlpsrc
index ccfaa691712..827e2a52430 100644
--- a/Master/tlpkg/tlpsrc/mflua.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mflua.tlpsrc
@@ -3,9 +3,11 @@ shortdesc configuration and base files for MFLua
longdesc For information on this Lua-enabled Metafont,
longdesc see, for example: tug.org/TUGboat/tb32-2/tb101scarso.pdf.
+# must keep in sync with luatex.tlpsrc.
+tlpsetvar no_luajit_platforms x86_64-solaris
+
+# disabled until there is a user base.
tlpsetvar fmtdeps luatex,metafont
-#
-# disabled just until rebuilds for start_of_mf.lua are done.
execute AddFormat name=mflua engine=mflua-nowin options="mf.ini" \
fmttriggers=${fmtdeps} mode=disabled
@@ -15,9 +17,6 @@ runpattern d texmf-dist/metafont/mflua
binpattern f bin/${ARCH}/mflua
binpattern f bin/${ARCH}/mflua-nowin
-# keep in sync with luatex.tlpsrc.
-tlpsetvar no_luajit_platforms x86_64-solaris
-#
binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit
binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit-nowin
diff --git a/Master/tlpkg/tlpsrc/platex.tlpsrc b/Master/tlpkg/tlpsrc/platex.tlpsrc
index 47c8fdd70ff..3c5b5888d1a 100644
--- a/Master/tlpkg/tlpsrc/platex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/platex.tlpsrc
@@ -1,4 +1,4 @@
-tlpsetvar fmtcomm babel,cm,hyphen-base,latex-fonts,ptex-fonts
+tlpsetvar fmtcomm ${global_latex_deps},ptex-fonts
#
execute AddFormat name=platex engine=eptex options="*platex.ini" \
patterns=language.dat \
diff --git a/Master/tlpkg/tlpsrc/uplatex.tlpsrc b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
index 61a9668b1e2..c3585e70dc3 100644
--- a/Master/tlpkg/tlpsrc/uplatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
@@ -1,6 +1,6 @@
# uplatex depends on platex (starting from 2018-03-09 release).
#
-tlpsetvar fmtcomm babel,cm,hyphen-base,latex-fonts,uptex-fonts,platex
+tlpsetvar fmtcomm ${global_latex_deps},uptex-fonts,platex
#
execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" \
patterns=language.dat \
diff --git a/Master/tlpkg/tlpsrc/xmltex.tlpsrc b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
index 564685d480c..1c69009be8b 100644
--- a/Master/tlpkg/tlpsrc/xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
@@ -3,7 +3,7 @@ depend pdftex
depend tex
depend xmltexconfig
-tlpsetvar fmtcomm babel,cm,dehyph,hyphen-base,latex,latex-fonts,latexconfig,\
+tlpsetvar fmtcomm ${global_latex_deps},dehyph,latex,latexconfig,\
tex-ini-files,xmltexconfig
#
execute AddFormat name=xmltex engine=pdftex patterns=language.dat \