summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-02-15 01:36:29 +0000
committerKarl Berry <karl@freefriends.org>2024-02-15 01:36:29 +0000
commitfa4e952c73de3fa2e62470cc8bc7fe6226a2ed2f (patch)
treeb98cf00071ba88fad49c5b35a165acfe862bc41e
parentc80bccd8fb3862f77151561e3cbb68fafdad58f3 (diff)
doc,sync,c2b
git-svn-id: svn://tug.org/texlive/trunk@69893 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/.github/workflows/main.yml4
-rw-r--r--Build/source/texk/texlive/ChangeLog4
-rw-r--r--Build/source/texk/texlive/tl_support/fmtutil.cnf6
-rwxr-xr-xMaster/tlpkg/bin/c2b4
-rw-r--r--Master/tlpkg/tlpsrc/cweb.tlpsrc2
5 files changed, 14 insertions, 6 deletions
diff --git a/Build/source/.github/workflows/main.yml b/Build/source/.github/workflows/main.yml
index ffc3096ea56..3472666bcc0 100644
--- a/Build/source/.github/workflows/main.yml
+++ b/Build/source/.github/workflows/main.yml
@@ -16,7 +16,9 @@
# /home/norbert/git-svn-repos/git-svn-syncer --new texlive-source
#
# A build is started with every commit. If a commit happens while a
-# build is running, the build is cancelled and a new one started.
+# build is running, somtimes the build is cancelled and a new one
+# started, and other times the new build waits until the old one is
+# complete? Seems mysterious.
#
# See tlpkg/bin/tl-update-bindir for retrieving the binaries, which is
# done only when a release is tagged, not from the
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index 28432fb3f06..3d709bc06a5 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,7 @@
+2024-02-12 Karl Berry <karl@tug.org>
+
+ * windows_wrapper/runscript.tlu: sync from bin/windows.
+
2023-09-10 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* windows_wrapper/{calldll,callexe,runscript_dll,runscript_exe,
diff --git a/Build/source/texk/texlive/tl_support/fmtutil.cnf b/Build/source/texk/texlive/tl_support/fmtutil.cnf
index d6dd5748b9d..324b3a4e6b3 100644
--- a/Build/source/texk/texlive/tl_support/fmtutil.cnf
+++ b/Build/source/texk/texlive/tl_support/fmtutil.cnf
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Thu Dec 14 01:43:44 2023
+# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Tue Feb 13 01:43:44 2024
# Originally written by Thomas Esser, 1998. Public domain.
#
# For guidance on how to support local formats, see the man
@@ -129,8 +129,8 @@ platex euptex language.dat *platex.ini
platex-dev euptex language.dat *platex.ini
#
# from ptex:
-eptex eptex language.def *eptex.ini
-ptex eptex - ptex.ini
+eptex euptex language.def *eptex.ini
+ptex euptex - ptex.ini
#
# from tex:
tex tex - tex.ini
diff --git a/Master/tlpkg/bin/c2b b/Master/tlpkg/bin/c2b
index c48480085fa..29edcd92f3e 100755
--- a/Master/tlpkg/bin/c2b
+++ b/Master/tlpkg/bin/c2b
@@ -4,5 +4,5 @@
# c2b - run c2l but inside /home/texlive/branch.
PATH=`echo $PATH | sed -e s,karl/Master,branch/Master,g`
-cd $HOME || exit 1 # just in case . is a trunk bin directory
-exec c2a "$@"
+cd $HOME || exit 1 # just in case . is a trunk bin directory
+exec ${c2a-c2a} "$@" # allowing overriding with c2lx
diff --git a/Master/tlpkg/tlpsrc/cweb.tlpsrc b/Master/tlpkg/tlpsrc/cweb.tlpsrc
index ce495176860..b46ebfb1c89 100644
--- a/Master/tlpkg/tlpsrc/cweb.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cweb.tlpsrc
@@ -5,11 +5,13 @@ binpattern f bin/${ARCH}/cweave
#
binpattern f bin/${ARCH}/ctwill
binpattern f bin/${ARCH}/ctwill-proofsort
+binpattern f/windows bin/${ARCH}/ctwill-proofsort.pl
binpattern f bin/${ARCH}/ctwill-refsort
binpattern f bin/${ARCH}/ctwill-twinx
#
binpattern f bin/${ARCH}/twill
binpattern f bin/${ARCH}/twill-refsort
+binpattern f/windows bin/${ARCH}/twill-refsort.pl
docpattern +f texmf-dist/doc/man/man1/ctangle.*
docpattern +f texmf-dist/doc/man/man1/cweave.*