texlive[69786] trunk: oops, go back to sh mktexlsr, accidentally got

commits+karl at tug.org commits+karl at tug.org
Sun Feb 11 00:22:22 CET 2024


Revision: 69786
          https://tug.org/svn/texlive?view=revision&revision=69786
Author:   karl
Date:     2024-02-11 00:22:21 +0100 (Sun, 11 Feb 2024)
Log Message:
-----------
oops, go back to sh mktexlsr, accidentally got pl version; other tweaks

Modified Paths:
--------------
    trunk/Build/source/.github/workflows/main.yml
    trunk/Build/source/ChangeLog
    trunk/Build/source/texk/kpathsea/ChangeLog
    trunk/Build/source/texk/kpathsea/texmf.cnf
    trunk/Build/source/texk/tex4htk/ChangeLog
    trunk/Build/source/texk/tex4htk/Makefile.am
    trunk/Build/source/texk/tex4htk/Makefile.in
    trunk/Build/source/texk/texlive/linked_scripts/ChangeLog
    trunk/Build/source/texk/texlive/linked_scripts/Makefile.am
    trunk/Build/source/texk/texlive/linked_scripts/Makefile.in
    trunk/Master/bin/aarch64-linux/mktexlsr
    trunk/Master/bin/amd64-freebsd/mktexlsr
    trunk/Master/bin/i386-freebsd/mktexlsr
    trunk/Master/bin/i386-linux/mktexlsr
    trunk/Master/bin/i386-solaris/mktexlsr
    trunk/Master/bin/x86_64-darwinlegacy/mktexlsr
    trunk/Master/bin/x86_64-linux/mktexlsr
    trunk/Master/bin/x86_64-linuxmusl/mktexlsr
    trunk/Master/bin/x86_64-solaris/mktexlsr
    trunk/Master/tlpkg/doc/releng.txt

Modified: trunk/Build/source/.github/workflows/main.yml
===================================================================
--- trunk/Build/source/.github/workflows/main.yml	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/.github/workflows/main.yml	2024-02-10 23:22:21 UTC (rev 69786)
@@ -37,7 +37,8 @@
       matrix:
         # we need to list the archs here, otherwise the matrix contains only
         # one element release_build and that is overwritten by the include statements
-        tl_name: [ i386-linux, x86_64-linux, x86_64-linuxmusl, aarch64-linux, armhf-linux ]
+        tl_name: [ i386-linux, x86_64-linux, x86_64-linuxmusl ]
+#        tl_name: [ i386-linux, x86_64-linux, x86_64-linuxmusl, aarch64-linux, armhf-linux ]
         release_build:
           - ${{ startsWith(github.ref, 'refs/tags/') }}
         include:

Modified: trunk/Build/source/ChangeLog
===================================================================
--- trunk/Build/source/ChangeLog	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/ChangeLog	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1,3 +1,9 @@
+2024-02-10  Karl Berry  <karl at tug.org>
+
+	* .github/workflows/main.yml: aarch64 and armhf are taking forever
+	(1h50m and counting), try disabling.  Also try disabling the
+	build-on-push-to-trunk for the moment.
+
 2023-12-31  Karl Berry  <karl at freefriends.org>
 
 	* reautoconf: add -f / --force option to pass to autoreconf.

Modified: trunk/Build/source/texk/kpathsea/ChangeLog
===================================================================
--- trunk/Build/source/texk/kpathsea/ChangeLog	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/texk/kpathsea/ChangeLog	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1,3 +1,7 @@
+2023-02-10  Karl Berry  <karl at tug.org>
+
+	* texmf.cnf (TEXMFVAR, TEXMFCONFIG, doc): 2024.
+
 2024-01-31  Akira Kakuto  <kakuto at jcom.zaq.ne.jp>
 
 	* tex-file.c (kpathsea_name_ok) [MSDOS]: change #ifndef MSDOS

Modified: trunk/Build/source/texk/kpathsea/texmf.cnf
===================================================================
--- trunk/Build/source/texk/kpathsea/texmf.cnf	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/texk/kpathsea/texmf.cnf	2024-02-10 23:22:21 UTC (rev 69786)
@@ -4,8 +4,8 @@
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
 % updated.  Instead, put your changes -- and only your changes, not an
 % entire copy! -- in ../../texmf.cnf.  That is, if this file is
-% installed in /some/path/to/texlive/2023/texmf-dist/web2c/texmf.cnf,
-% put your custom settings in /some/path/to/texlive/2023/texmf.cnf.
+% installed in /some/path/to/texlive/2024/texmf-dist/web2c/texmf.cnf,
+% put your custom settings in /some/path/to/texlive/2024/texmf.cnf.
 % (Below, we use YYYY in place of the specific year.)
 % 
 % What follows is a super-summary of what this .cnf file can
@@ -87,10 +87,10 @@
 TEXMFHOME = ~/texmf
 
 % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2023/texmf-var
+TEXMFVAR = ~/.texlive2024/texmf-var
 
 % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2023/texmf-config
+TEXMFCONFIG = ~/.texlive2024/texmf-config
 
 % This is the value manipulated by tlmgr's auxtrees subcommand in the
 % root texmf.cnf. Kpathsea warns about a literally empty string for a

Modified: trunk/Build/source/texk/tex4htk/ChangeLog
===================================================================
--- trunk/Build/source/texk/tex4htk/ChangeLog	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/texk/tex4htk/ChangeLog	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1,3 +1,7 @@
+2024-02-10  Karl Berry  <karl at tug.org>
+
+	* Makefile.am (shell_scripts): remove htcontext.
+
 2023-10-13  Karl Berry  <karl at freefriends.org>
 
 	* tex4ht.c: avoid invalid read and uninitialized comparisons.

Modified: trunk/Build/source/texk/tex4htk/Makefile.am
===================================================================
--- trunk/Build/source/texk/tex4htk/Makefile.am	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/texk/tex4htk/Makefile.am	2024-02-10 23:22:21 UTC (rev 69786)
@@ -27,7 +27,7 @@
 @KPATHSEA_RULE@
 
 perl_scripts = mk4ht
-shell_scripts = ht htcontext htlatex htmex httex httexi \
+shell_scripts = ht htlatex htmex httex httexi \
   htxelatex htxetex xhlatex
 
 scriptsdir = texmf-dist/scripts/tex4ht

Modified: trunk/Build/source/texk/tex4htk/Makefile.in
===================================================================
--- trunk/Build/source/texk/tex4htk/Makefile.in	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/texk/tex4htk/Makefile.in	2024-02-10 23:22:21 UTC (rev 69786)
@@ -130,8 +130,8 @@
 tex4ht_OBJECTS = $(am_tex4ht_OBJECTS)
 tex4ht_LDADD = $(LDADD)
 tex4ht_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__dist_bin_SCRIPTS_DIST = ht.bat htcontext.bat htlatex.bat htmex.bat \
-	httex.bat httexi.bat htxelatex.bat htxetex.bat xhlatex.bat
+am__dist_bin_SCRIPTS_DIST = ht.bat htlatex.bat htmex.bat httex.bat \
+	httexi.bat htxelatex.bat htxetex.bat xhlatex.bat
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -412,7 +412,7 @@
 tex4ht_SOURCES = tex4ht.c
 LDADD = $(KPATHSEA_LIBS)
 perl_scripts = mk4ht
-shell_scripts = ht htcontext htlatex htmex httex httexi \
+shell_scripts = ht htlatex htmex httex httexi \
   htxelatex htxetex xhlatex
 
 scriptsdir = texmf-dist/scripts/tex4ht

Modified: trunk/Build/source/texk/texlive/linked_scripts/ChangeLog
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/ChangeLog	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/texk/texlive/linked_scripts/ChangeLog	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1,3 +1,9 @@
+2024-02-11  Karl Berry  <karl at tug.org>
+
+	* Makefile.am (texmf_other_scripts): whoops, undo
+	mktexlsr.pl, it's overwriting the sh version. Something
+	to look at later.
+
 2024-02-08  Karl Berry  <karl at tug.org>
 
 	* Makefile.am (texmf_other_scripts): add texlive/mktexlsr.pl,

Modified: trunk/Build/source/texk/texlive/linked_scripts/Makefile.am
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/Makefile.am	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/texk/texlive/linked_scripts/Makefile.am	2024-02-10 23:22:21 UTC (rev 69786)
@@ -238,7 +238,6 @@
 	texlive/fmtutil-user.sh \
 	texlive/fmtutil.pl \
 	texlive/mktexlsr \
-	texlive/mktexlsr.pl \
 	texlive/mktexmf \
 	texlive/mktexpk \
 	texlive/mktextfm \

Modified: trunk/Build/source/texk/texlive/linked_scripts/Makefile.in
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/Makefile.in	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Build/source/texk/texlive/linked_scripts/Makefile.in	2024-02-10 23:22:21 UTC (rev 69786)
@@ -455,7 +455,6 @@
 	texlive/fmtutil-user.sh \
 	texlive/fmtutil.pl \
 	texlive/mktexlsr \
-	texlive/mktexlsr.pl \
 	texlive/mktexmf \
 	texlive/mktexpk \
 	texlive/mktextfm \

Modified: trunk/Master/bin/aarch64-linux/mktexlsr
===================================================================
--- trunk/Master/bin/aarch64-linux/mktexlsr	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/bin/aarch64-linux/mktexlsr	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1 +1 @@
-link ../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+link ../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file

Modified: trunk/Master/bin/amd64-freebsd/mktexlsr
===================================================================
--- trunk/Master/bin/amd64-freebsd/mktexlsr	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/bin/amd64-freebsd/mktexlsr	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1 +1 @@
-link ../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+link ../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file

Modified: trunk/Master/bin/i386-freebsd/mktexlsr
===================================================================
--- trunk/Master/bin/i386-freebsd/mktexlsr	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/bin/i386-freebsd/mktexlsr	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1 +1 @@
-link ../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+link ../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file

Modified: trunk/Master/bin/i386-linux/mktexlsr
===================================================================
--- trunk/Master/bin/i386-linux/mktexlsr	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/bin/i386-linux/mktexlsr	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1 +1 @@
-link ../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+link ../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file

Modified: trunk/Master/bin/i386-solaris/mktexlsr
===================================================================
--- trunk/Master/bin/i386-solaris/mktexlsr	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/bin/i386-solaris/mktexlsr	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1 +1 @@
-link ../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+link ../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file

Modified: trunk/Master/bin/x86_64-darwinlegacy/mktexlsr
===================================================================
--- trunk/Master/bin/x86_64-darwinlegacy/mktexlsr	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/bin/x86_64-darwinlegacy/mktexlsr	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1 +1 @@
-link ../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+link ../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file

Modified: trunk/Master/bin/x86_64-linux/mktexlsr
===================================================================
--- trunk/Master/bin/x86_64-linux/mktexlsr	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/bin/x86_64-linux/mktexlsr	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1 +1 @@
-link ../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+link ../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file

Modified: trunk/Master/bin/x86_64-linuxmusl/mktexlsr
===================================================================
--- trunk/Master/bin/x86_64-linuxmusl/mktexlsr	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/bin/x86_64-linuxmusl/mktexlsr	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1 +1 @@
-link ../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+link ../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file

Modified: trunk/Master/bin/x86_64-solaris/mktexlsr
===================================================================
--- trunk/Master/bin/x86_64-solaris/mktexlsr	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/bin/x86_64-solaris/mktexlsr	2024-02-10 23:22:21 UTC (rev 69786)
@@ -1 +1 @@
-link ../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+link ../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file

Modified: trunk/Master/tlpkg/doc/releng.txt
===================================================================
--- trunk/Master/tlpkg/doc/releng.txt	2024-02-10 22:52:53 UTC (rev 69785)
+++ trunk/Master/tlpkg/doc/releng.txt	2024-02-10 23:22:21 UTC (rev 69786)
@@ -181,7 +181,7 @@
   env force_rebuild=true cron.pretest  # will update repository, hopefully
 We use cp -a because we want to start with exactly the last tlnet,
 and not recreate all packages, so that a file with a given name is never
-rewritten. See recreate comments in tl-update-tlpdb and tl-update-containers.
+overwritten. See recreate comments in tl-update-tlpdb and tl-update-containers.
 
 9b. Sanity check: Do an installation as a normal user from the new
 tlpretest, and keep this installation updated daily as normal users do,
@@ -188,7 +188,7 @@
 that is, with tlmgr update --self --all.
 
 9c. Update other automatically-built binary sets, 
-and ask tlbuild to build all (including asymptote).
+and ask tlbuild to build all (including asymptote, if new).
 
 9d. In 2020, as a special case, after a first successful build, this was run:
   tl-fix-container-links



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