texlive[70992] Master/tlpkg/tlpsrc/xmltex.tlpsrc:

commits+karl at tug.org commits+karl at tug.org
Fri Apr 19 18:00:15 CEST 2024


Revision: 70992
          https://tug.org/svn/texlive?view=revision&revision=70992
Author:   karl
Date:     2024-04-19 18:00:15 +0200 (Fri, 19 Apr 2024)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
    trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc
    trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc
    trunk/Master/tlpkg/tlpsrc/l3backend.tlpsrc
    trunk/Master/tlpkg/tlpsrc/l3kernel.tlpsrc
    trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
    trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
    trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc
    trunk/Master/tlpkg/tlpsrc/platex.tlpsrc
    trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc
    trunk/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
    trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc

Property Changed:
----------------
    trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc
    trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc

Modified: trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -14,7 +14,8 @@
 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 @@
 # 
 # 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

Modified: trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -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

Index: trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)

Property changes on: trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1708385266
\ No newline at end of property
+1713541799
\ No newline at end of property
Modified: trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -8,7 +8,7 @@
 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,\

Modified: trunk/Master/tlpkg/tlpsrc/l3backend.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/l3backend.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/l3backend.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -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

Modified: trunk/Master/tlpkg/tlpsrc/l3kernel.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/l3kernel.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/l3kernel.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -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

Modified: trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -19,7 +19,7 @@
 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

Modified: trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -14,7 +14,7 @@
 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
 

Modified: trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -4,7 +4,7 @@
 #
 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" \

Modified: trunk/Master/tlpkg/tlpsrc/platex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/platex.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/platex.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -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 @@
 ##   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 \

Modified: trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -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 \

Modified: trunk/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -9,4 +9,4 @@
 
 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

Index: trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)

Property changes on: trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1708385266
\ No newline at end of property
+1713541799
\ No newline at end of property
Modified: trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc	2024-04-19 15:58:50 UTC (rev 70991)
+++ trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc	2024-04-19 16:00:15 UTC (rev 70992)
@@ -2,8 +2,7 @@
 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" \



More information about the tex-live-commits mailing list.