summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlpsrc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-18 19:48:25 +0000
committerKarl Berry <karl@freefriends.org>2024-04-18 19:48:25 +0000
commit0c9828a4f12791b59e5d85a69976e43be42bdeae (patch)
treeb74022d5c113a5b06c5797536a5936d36b5acafc /Master/tlpkg/tlpsrc
parent73e8d411206265becaf3dfce8ae2591df9f7e287 (diff)
l3kernel-dev
git-svn-id: svn://tug.org/texlive/trunk@70976 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlpsrc')
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/l3kernel-dev.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc5
-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
7 files changed, 21 insertions, 9 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 3460acde9ee..95f4f0db720 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -37,13 +37,15 @@ longdesc See the TeXLive::TLPSRC documentation for more.
# or the nightly build will fail due to inconsistent triggers.
#
tlpsetvar global_latex_deps \
-babel,cm,firstaid,hyphen-base,\
-l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data
+ babel,cm,firstaid,hyphen-base,latex,latex-fonts,tex-ini-files,unicode-data
#
# 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
+ 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/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 7c3e331e9de..9e841e86596 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -768,7 +768,9 @@ depend komacv
depend komacv-rg
depend korigamik
depend ktv-texdata
+depend l3backend-dev
depend l3build
+depend l3kernel-dev
depend labbook
depend labels
depend labels4easylist
diff --git a/Master/tlpkg/tlpsrc/l3kernel-dev.tlpsrc b/Master/tlpkg/tlpsrc/l3kernel-dev.tlpsrc
new file mode 100644
index 00000000000..98d05d2c366
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/l3kernel-dev.tlpsrc
@@ -0,0 +1,5 @@
+depend l3backend-dev
+
+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 4efea8878cd..ade7fc0d0c4 100644
--- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
@@ -3,12 +3,15 @@ shortdesc LaTeX pre-release executables and formats
longdesc See the latex-base-dev package for information.
# ensure files and engines are installed before we are run.
+# many are redundant with the format dependencies, but that's ok.
depend luatex
depend luahbtex
depend pdftex
depend latexconfig
depend latex-fonts
#
+depend l3backend-dev
+depend l3kernel-dev
depend latex-base-dev
depend latex-firstaid-dev
depend latex-graphics-dev
@@ -16,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},latex-base-dev,latex-firstaid-dev
+tlpsetvar fmtcomm ${global_latex_deps},${global_latex_dev_deps}
#
tlpsetvar nonluafmtdeps dehyph,hyph-utf8,latexconfig
tlpsetvar luafmtdeps lm,luaotfload
diff --git a/Master/tlpkg/tlpsrc/platex.tlpsrc b/Master/tlpkg/tlpsrc/platex.tlpsrc
index 57b0b6a2132..05674c41ce9 100644
--- a/Master/tlpkg/tlpsrc/platex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/platex.tlpsrc
@@ -6,11 +6,11 @@ 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},latex
+ fmttriggers=${fmtcomm}
#
execute AddFormat name=platex-dev engine=euptex options="*platex.ini" \
patterns=language.dat \
- fmttriggers=${fmtcomm},l3kernel,latex-base-dev,latex-firstaid-dev
+ fmttriggers=${fmtcomm},${global_latex_dev_deps}
#
binpattern f bin/${ARCH}/platex
binpattern f bin/${ARCH}/platex-dev
diff --git a/Master/tlpkg/tlpsrc/uplatex.tlpsrc b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
index c9178be4c26..ca8ff2798b9 100644
--- a/Master/tlpkg/tlpsrc/uplatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
@@ -4,11 +4,11 @@ tlpsetvar fmtcomm ${global_latex_deps},uptex-fonts,platex
#
execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" \
patterns=language.dat \
- fmttriggers=${fmtcomm},latex
+ fmttriggers=${fmtcomm}
#
execute AddFormat name=uplatex-dev engine=euptex options="*uplatex.ini" \
patterns=language.dat \
- fmttriggers=${fmtcomm},l3kernel,latex-base-dev,latex-firstaid-dev
+ fmttriggers=${fmtcomm},${global_latex_dev_deps}
binpattern f bin/${ARCH}/uplatex
binpattern f bin/${ARCH}/uplatex-dev
diff --git a/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc b/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
index 4704544153f..5100986a781 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},latex-base-dev,latex-firstaid-dev,lm
+ fmttriggers=${global_latex_deps},${global_latex_dev_deps},lm