From 03455e0c2cf3f72d34026071f889510ed47ff98c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 27 Feb 2023 18:45:24 +0000 Subject: linked_scripts updates for context and windows; other syncs,doc git-svn-id: svn://tug.org/texlive/trunk@66220 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-check-wrapper-consistency | 14 +++++++++----- Master/tlpkg/bin/tl-update-linked-scripts | 2 -- Master/tlpkg/bin/tl-update-news | 2 -- Master/tlpkg/doc/releng.txt | 5 +++-- 4 files changed, 12 insertions(+), 11 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/bin/tl-check-wrapper-consistency b/Master/tlpkg/bin/tl-check-wrapper-consistency index e5d12532323..947cb9374bb 100755 --- a/Master/tlpkg/bin/tl-check-wrapper-consistency +++ b/Master/tlpkg/bin/tl-check-wrapper-consistency @@ -2,8 +2,8 @@ # $Id$ # Public domain. Originally written 2008. # -# Check that the same set of files are wrappers on w32 and symlinks on -# all others. +# Check that the same set of files are wrappers on windows +# and symlinks on all others. BEGIN { $^W = 1; @@ -30,11 +30,12 @@ sub main { my $bindir = "$Master/bin"; chdir ($bindir) || die "chdir($bindir) failed: $!"; + # get entries from one Unix platform, assuming they're the same everywhere. my %w = &unx_wrapper_entries ("x86_64-linux"); - chomp (my $srcdir = `cd $Master/../Build/source/texk/texlive && pwd`); - $cww = "$srcdir/w32_wrapper/runscript.exe"; - $err += &check_w32 ("windows", $cww, %w); + my $windows_dir = "windows"; + $cww = "windows/runscript.exe"; + $err += &check_w32 ($windows_dir, $cww, %w); return $err; } @@ -79,6 +80,9 @@ sub unx_wrapper_entries { # cases) exists in W32DIR as a .exe, and furthermore is a copy of the # canonical w32 wrapper exe specified in W32CANONICAL. # +# (2023: our windows binaries aren't 32-bit any more, but don't bother +# renaming.) +# sub check_w32 { my ($w32dir, $w32canonical, %uw) = @_; my $diff = 0; diff --git a/Master/tlpkg/bin/tl-update-linked-scripts b/Master/tlpkg/bin/tl-update-linked-scripts index dfdc3370cf4..d2c6c814008 100755 --- a/Master/tlpkg/bin/tl-update-linked-scripts +++ b/Master/tlpkg/bin/tl-update-linked-scripts @@ -10,8 +10,6 @@ Master=`cd $mydir/../.. && pwd` compare_and_copy () { for file in "$@"; do #echo "comparing $Src/$file to $Dest..." - # context is its own thing, don't try to handle here. - echo "$file" | grep '/context.sh$' >/dev/null && continue cmp -s $Src/$file $Dest/$file && continue diff --git a/Master/tlpkg/bin/tl-update-news b/Master/tlpkg/bin/tl-update-news index 4e58368125f..cc5e2bbb3e7 100755 --- a/Master/tlpkg/bin/tl-update-news +++ b/Master/tlpkg/bin/tl-update-news @@ -11,8 +11,6 @@ # # pdftex, luatex, mpost, cweb and related, ptex and related; # all these are updated separately, not in this script. -# For pdftex and mpost, see the doc/manual subdirectories -# in their respective repositories. # # (By the way, we don't ordinarily use sh -e, but since all we're doing # here is a bunch of copies, it seemed the simplest.) diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt index 4de92214c95..8e1d72a286a 100644 --- a/Master/tlpkg/doc/releng.txt +++ b/Master/tlpkg/doc/releng.txt @@ -274,8 +274,9 @@ M. As pretest proceeds, update the doc: and changes throughout if behavior has changed. Engine/etc. doc updates: . run tl-update-news, which copies simple files to the runtime. - . pdftex/luatex maintainers should update their manuals - from their respective doc/manual subdirs to runtime. And others. + . pdftex/mpost/luatex maintainers should update their manuals + from their repositories (doc/manual/ and manual/ subdirs for the + first two) to the runtime. . consider updates of core man pages in Build/source/texk/web2c/man. Update tlbuild.texi text, then xs=.../Build/source -- cgit v1.2.3