diff options
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-bindir | 11 | ||||
| -rw-r--r-- | Master/tlpkg/dev/srclist.txt | 23 |
2 files changed, 22 insertions, 12 deletions
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index 710531ec115..fe146711a70 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -11,9 +11,9 @@ tmpdir=${TMPDIR-/tmp}/tlupbin.$$ trap "rm -rf $tmpdir" 0 1 2 15 test -d $tmpdir || mkdir -p $tmpdir -usage="$0 [OPTION]... TL-PLATFORM... +usage="$0 [OPTION]... TLPLATFORM... -Update the TeX Live executables for each TL-PLATFORM (which must be a TL +Update the TeX Live executables for each TLPLATFORM (which must be a TL platform name, e.g., i386-linux) from a build directory. The new binaries are taken from the location specified by --bin-loc, @@ -33,7 +33,7 @@ requires when a symlink is replaced by a file or vice versa. Options: --bin-loc DIR-OR-TAR use binaries from DIR-OR-TAR - --master DIR install binaries to DIR/bin/TL-PLATFORM + --master DIR install binaries to DIR/bin/TLPLATFORM [default is the bin dir relative to this script] --help display this help and exit @@ -275,11 +275,12 @@ for tlplat in $tlplats; do ourdel=$tmpdir/2del ouradd=$tmpdir/2add - # looking for deletions, but don't delete (x)asy, biber, xindy. + # looking for deletions, but don't delete (x)asy, biber, xindy, context. comm -23 $tmpdir/now $tmpdir/new \ | egrep -v '^(x?asy(\.exe)?|freeglut\.dll)$' \ | egrep -v '^biber(-ms)?(\.exe)?$' \ | egrep -v '^dvisvgm$' \ + | egrep -v '^(luametatex|context(.lua)?|mtxrun$' \ | egrep -v 'xindy' \ >$ourdel # intentionally anything matching xindy comm -13 $tmpdir/now $tmpdir/new >$ouradd # looking for additions @@ -366,5 +367,5 @@ for tlplat in $tlplats; do $msg "final svn status..." svn status | sort - rm -rf $tmpdir + echo rm -rf $tmpdir done diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt index 7a225dceb25..b31d77789ea 100644 --- a/Master/tlpkg/dev/srclist.txt +++ b/Master/tlpkg/dev/srclist.txt @@ -6,15 +6,15 @@ # tlpkg/bin/tl-update-auto and tlpkg/bin/check-*. # # This file is input for the script config/srclist-update in the gnulib -# project (http://savannah.gnu.org/projects/gnulib). Typical invocation: +# project (https://savannah.gnu.org/projects/gnulib). Typical invocation: # /path/to/gnulib/config/srclist-update \ # /path/to/srcdir </path/to/srcdir/build-aux/srclist.txt # (see ~karl/bin/cron.tl) # # The output will be diffs for any files that are not up to date. -# Basic config files. texmf.cnf is changed for all of 2021, -# let's not see it every day. +# Basic config files. texmf.cnf is changed too much in the source during +# the development year to try to sync it always with the runtime. #Master/texmf-dist/web2c/texmf.cnf Build/source/texk/kpathsea/ Master/texmf-dist/web2c/fmtutil.cnf Build/source/texk/texlive/tl_support/fmtutil.cnf @@ -22,8 +22,8 @@ Master/texmf-dist/web2c/fmtutil.cnf Build/source/texk/texlive/tl_support/fmtutil Master/tlpkg/TeXLive/TLUtils.pm Build/source/texk/tests/TeXLive/ Master/tlpkg/TeXLive/TLConfig.pm Build/source/texk/tests/TeXLive/ -# Maintained in Master (with Id expansion). -Master/bin/windows/runscript.tlu Build/source/texk/texlive/w32_wrapper/runscript.tlu +# Maintained in Master (with Id expansion there). +Master/bin/windows/runscript.tlu Build/source/texk/texlive/windows_wrapper/runscript.tlu # Glyph lists used by pdftex, now maintained in lcdf-typetools: Build/source/texk/lcdf-typetools/lcdf-typetools-*/glyphtounicode.tex Master/texmf-dist/tex/generic/pdftex/glyphtounicode.tex @@ -39,12 +39,21 @@ Build/source/texk/dvipdfm-x/data/dvipdfmx.cfg Master/texmf-dist/dvipdfmx/dvipdfm # Scripts from GNU packages (locally) installed on the system; see # Build/source/build-aux/README.TL. # +# must reenable libtool after figuring out why it's still finding 2.4.6. +# --karl, 28feb23 +#/usr/local/gnu/share/libtool/build-aux/ltmain.sh Build/source/build-aux/ltmain.sh +#/usr/local/gnu/share/aclocal/libtool.m4 Build/source/m4/libtool.m4 +#/usr/local/gnu/share/aclocal/ltargz.m4 Build/source/m4/ltargz.m4 +#/usr/local/gnu/share/aclocal/ltdl.m4 Build/source/m4/ltdl.m4 +#/usr/local/gnu/share/aclocal/ltoptions.m4 Build/source/m4/ltoptions.m4 +#/usr/local/gnu/share/aclocal/ltsugar.m4 Build/source/m4/ltsugar.m4 +#/usr/local/gnu/share/aclocal/ltversion.m4 Build/source/m4/ltversion.m4 +#/usr/local/gnu/share/aclocal/lt~obsolete.m4 Build/source/m4/lt~obsolete.m4 +# # The version number embedded in the automake path is unfortunate (have # to update manually at new automake releases), but automake provides no # version-independent access. # -/usr/local/gnu/share/libtool/build-aux/ltmain.sh Build/source/build-aux/ltmain.sh -# /usr/local/gnu/share/automake-1.16/missing Build/source/build-aux/missing /usr/local/gnu/share/automake-1.16/test-driver Build/source/build-aux/test-driver /usr/local/gnu/share/automake-1.16/ylwrap Build/source/build-aux/ylwrap |