summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-19 16:00:15 +0000
committerKarl Berry <karl@freefriends.org>2024-04-19 16:00:15 +0000
commite1f572b0154c287cf0b4cd34f6695ec0a45c3ac7 (patch)
treebcd4caad0464dfb7c5411285d24dedc972f2ab55 /Master/tlpkg
parentd5599563dc6f907e019b035598bda49fec35d4f6 (diff)
00texlive.autopatterns.tlpsrc (global_latex_common_deps): new variable.
(global_latex_deps,global_latex_dev_deps): use it; make lists parallel. *.tlpsrc: change and simplify accordingly. l3{backend,kernel}.tlpsrc: must exclude new corresponding -dev directories. git-svn-id: svn://tug.org/texlive/trunk@70992 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc17
-rw-r--r--Master/tlpkg/tlpsrc/eplain.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/jadetex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/l3backend.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/l3kernel.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mltex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/platex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/uplatex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/xmltex.tlpsrc3
12 files changed, 29 insertions, 21 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 95f4f0db720..10b9e97ea65 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -14,7 +14,8 @@ longdesc currently implemented, though it could be done if useful.
longdesc
longdesc See the TeXLive::TLPSRC documentation for more.
-# These ${global_latex_deps} packages are used by (nearly) all LaTeX variants.
+# These ${global_latex_deps} and related are used by (nearly) all LaTeX
+# variants.
#
# l3backend is not actually read when the .fmt is made (by design), but
# it is used by the l3kernel code that is in the .fmt. It seems safer in
@@ -34,17 +35,21 @@ longdesc See the TeXLive::TLPSRC documentation for more.
#
# When this variable changes, or any variable in this file, it is
# necessary to manually force an update for the dependent packages,
-# or the nightly build will fail due to inconsistent triggers.
+# or the nightly build will fail due to differing triggers
+# (specifically, tl-compare-tlpdbs).
#
+tlpsetvar global_latex_common_deps \
+ babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data
+#
tlpsetvar global_latex_deps \
- babel,cm,firstaid,hyphen-base,latex,latex-fonts,tex-ini-files,unicode-data
+ l3backend,l3kernel,latex,latex-base,latex-firstaid,${global_latex_common_deps}
+#
+tlpsetvar global_latex_dev_deps \
+ l3backend-dev,l3kernel-dev,latex-base-dev,latex-firstaid-dev,${global_latex_common_deps}
#
# 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
-#
-tlpsetvar global_latex_dev_deps \
- l3kernel-dev,l3backend-dev,latex-base-dev,latex-firstaid-dev
# Platforms that don't support jit.
tlpsetvar global_no_luajit_platforms i386-solaris,x86_64-solaris
diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc
index 5d4c1c5a97a..917e94659ec 100644
--- a/Master/tlpkg/tlpsrc/eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc
@@ -1,9 +1,6 @@
depend pdftex
-# although eplain is not at all LaTeX, it loads Babel,
-# which turns out to need nearly all the core LaTeX packages.
-# Simplify maintenance by just using our global variable.
execute AddFormat name=eplain engine=pdftex patterns=language.dat \
options="-translate-file=cp227.tcx *eplain.ini" \
- fmttriggers=${global_latex_deps},dehyph,hyph-utf8,knuth-lib,plain
+ fmttriggers=babel,dehyph,hyph-utf8,knuth-lib,plain
binpattern f bin/${ARCH}/eplain
diff --git a/Master/tlpkg/tlpsrc/jadetex.tlpsrc b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
index 58dc71793c5..23633deb13d 100644
--- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
@@ -8,7 +8,7 @@ tlpsetvar fmtcomm ${global_latex_deps},\
amsfonts,auxhook,bigintcalc,bitset,\
colortbl,cyrillic,dehyph,ec,etoolbox,fancyhdr,gettitlestring,graphics,\
graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,iftex,\
-infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,latex,\
+infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,\
latexconfig,letltxmacro,ltxcmds,marvosym,\
passivetex,pdfescape,pdftexcmds,psnfss,refcount,rerunfilecheck,stmaryrd,\
symbol,tipa,tools,ulem,uniquecounter,url,\
diff --git a/Master/tlpkg/tlpsrc/l3backend.tlpsrc b/Master/tlpkg/tlpsrc/l3backend.tlpsrc
index e69de29bb2d..940be7f08dc 100644
--- a/Master/tlpkg/tlpsrc/l3backend.tlpsrc
+++ b/Master/tlpkg/tlpsrc/l3backend.tlpsrc
@@ -0,0 +1,3 @@
+runpattern +!d texmf-dist/tex/latex-dev/l3backend
+srcpattern +!d texmf-dist/source/latex-dev/l3backend
+docpattern +!d texmf-dist/doc/latex-dev/l3backend
diff --git a/Master/tlpkg/tlpsrc/l3kernel.tlpsrc b/Master/tlpkg/tlpsrc/l3kernel.tlpsrc
index 8094cade925..2d48d5a0a5b 100644
--- a/Master/tlpkg/tlpsrc/l3kernel.tlpsrc
+++ b/Master/tlpkg/tlpsrc/l3kernel.tlpsrc
@@ -1 +1,5 @@
depend l3backend
+
+runpattern +!d texmf-dist/tex/latex-dev/l3kernel
+srcpattern +!d texmf-dist/source/latex-dev/l3kernel
+docpattern +!d texmf-dist/doc/latex-dev/l3kernel
diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
index ade7fc0d0c4..f713b6053eb 100644
--- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
@@ -19,7 +19,7 @@ depend latex-graphics-dev
docpattern f texmf-dist/doc/man/man1/*latex-dev.*
# cf. latex-bin.tlpsrc.
-tlpsetvar fmtcomm ${global_latex_deps},${global_latex_dev_deps}
+tlpsetvar fmtcomm ${global_latex_dev_deps}
#
tlpsetvar nonluafmtdeps dehyph,hyph-utf8,latexconfig
tlpsetvar luafmtdeps lm,luaotfload
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index 668961d3116..537064024f6 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -14,7 +14,7 @@ depend latex
depend graphics
# cf. latex-bin-dev.tlpsrc.
-tlpsetvar fmtcomm ${global_latex_deps},latex
+tlpsetvar fmtcomm ${global_latex_deps}
tlpsetvar nonluafmtdeps dehyph,hyph-utf8,latexconfig
tlpsetvar luafmtdeps lm,luaotfload
diff --git a/Master/tlpkg/tlpsrc/mltex.tlpsrc b/Master/tlpkg/tlpsrc/mltex.tlpsrc
index ac6a4c9b899..98e61ea931f 100644
--- a/Master/tlpkg/tlpsrc/mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc
@@ -4,7 +4,7 @@ tlpsetvar fmtdeps cm,hyphen-base
#
execute AddFormat name=mllatex engine=pdftex patterns=language.dat \
options="-translate-file=cp227.tcx -mltex *mllatex.ini" \
- fmttriggers=${global_latex_deps},dehyph,hyph-utf8,latex,latexconfig
+ fmttriggers=${global_latex_deps},dehyph,hyph-utf8,latexconfig
#
execute AddFormat name=mltex engine=pdftex \
options="-translate-file=cp227.tcx -mltex mltex.ini" \
diff --git a/Master/tlpkg/tlpsrc/platex.tlpsrc b/Master/tlpkg/tlpsrc/platex.tlpsrc
index 05674c41ce9..03005c89421 100644
--- a/Master/tlpkg/tlpsrc/platex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/platex.tlpsrc
@@ -1,4 +1,4 @@
-tlpsetvar fmtcomm ${global_latex_deps},ptex-fonts
+tlpsetvar fmtcomm ptex-fonts
#
## TL'23 will use euptex in legacy encoding mode for platex(-dev)
## but for a while "euptex for platex-dev" / "eptex for platex"
@@ -6,7 +6,7 @@ tlpsetvar fmtcomm ${global_latex_deps},ptex-fonts
## with LaTeX2e 2023-06-01.
execute AddFormat name=platex engine=euptex options="*platex.ini" \
patterns=language.dat \
- fmttriggers=${fmtcomm}
+ fmttriggers=${fmtcomm},${global_latex_deps}
#
execute AddFormat name=platex-dev engine=euptex options="*platex.ini" \
patterns=language.dat \
diff --git a/Master/tlpkg/tlpsrc/uplatex.tlpsrc b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
index ca8ff2798b9..79ac0ee6cac 100644
--- a/Master/tlpkg/tlpsrc/uplatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
@@ -1,10 +1,10 @@
# uplatex depends on platex (starting from 2018-03-09 release).
#
-tlpsetvar fmtcomm ${global_latex_deps},uptex-fonts,platex
+tlpsetvar fmtcomm uptex-fonts,platex
#
execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" \
patterns=language.dat \
- fmttriggers=${fmtcomm}
+ fmttriggers=${fmtcomm},${global_latex_deps}
#
execute AddFormat name=uplatex-dev engine=euptex options="*uplatex.ini" \
patterns=language.dat \
diff --git a/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc b/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
index 5100986a781..70eae462b5a 100644
--- a/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
@@ -9,4 +9,4 @@ docpattern f ignore
execute AddFormat name=xelatex-dev engine=xetex patterns=language.dat \
options="-etex xelatex.ini" \
- fmttriggers=${global_latex_deps},${global_latex_dev_deps},lm
+ fmttriggers=${global_latex_dev_deps},lm
diff --git a/Master/tlpkg/tlpsrc/xmltex.tlpsrc b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
index 610f770cb0a..c698c6e8e20 100644
--- a/Master/tlpkg/tlpsrc/xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
@@ -2,8 +2,7 @@ depend latex
depend pdftex
depend tex
-tlpsetvar fmtcomm ${global_latex_deps},dehyph,hyph-utf8,latex,latexconfig,\
-tex-ini-files
+tlpsetvar fmtcomm ${global_latex_deps},dehyph,hyph-utf8,latexconfig
#
execute AddFormat name=xmltex engine=pdftex patterns=language.dat \
options="*xmltex.ini" \