texlive[65994] Master/tlpkg: more win32->windows, doc, copyright 2023
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 21 00:40:00 CET 2023
Revision: 65994
http://tug.org/svn/texlive?view=revision&revision=65994
Author: karl
Date: 2023-02-21 00:40:00 +0100 (Tue, 21 Feb 2023)
Log Message:
-----------
more win32->windows, doc, copyright 2023
Modified Paths:
--------------
trunk/Master/tlpkg/TeXLive/TLCrypto.pm
trunk/Master/tlpkg/TeXLive/TLPSRC.pm
trunk/Master/tlpkg/TeXLive/TLTREE.pm
trunk/Master/tlpkg/TeXLive/TLUtils.pm
trunk/Master/tlpkg/TeXLive/TLWinGoo.pm
trunk/Master/tlpkg/bin/c2b
trunk/Master/tlpkg/bin/tl-check-wrapper-consistency
trunk/Master/tlpkg/bin/tl-compare-tlpdbs
trunk/Master/tlpkg/bin/tl-fix-container-links
trunk/Master/tlpkg/bin/tl-makeself-from-tlnet
trunk/Master/tlpkg/bin/tl-update-bindir
trunk/Master/tlpkg/bin/tl-update-install-pkg
trunk/Master/tlpkg/bin/tl-update-nsis
trunk/Master/tlpkg/bin/tl-update-tlcritical
trunk/Master/tlpkg/bin/tl-update-tlnet
trunk/Master/tlpkg/bin/tl-update-tlpdb
trunk/Master/tlpkg/bin/tlprm
trunk/Master/tlpkg/doc/releng.txt
Modified: trunk/Master/tlpkg/TeXLive/TLCrypto.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLCrypto.pm 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/TeXLive/TLCrypto.pm 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLCrypto.pm - handle checksums and signatures.
-# Copyright 2016-2021 Norbert Preining
+# Copyright 2016-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
Modified: trunk/Master/tlpkg/TeXLive/TLPSRC.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPSRC.pm 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/TeXLive/TLPSRC.pm 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLPSRC.pm - module for handling tlpsrc files
-# Copyright 2007-2021 Norbert Preining
+# Copyright 2007-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
Modified: trunk/Master/tlpkg/TeXLive/TLTREE.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLTREE.pm 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/TeXLive/TLTREE.pm 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLTREE.pm - work with the tree of all files
-# Copyright 2007-2021 Norbert Preining
+# Copyright 2007-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2022 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2023 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
Modified: trunk/Master/tlpkg/TeXLive/TLWinGoo.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLWinGoo.pm 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/TeXLive/TLWinGoo.pm 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLWinGoo.pm - Windows goop.
-# Copyright 2008-2021 Siep Kroonenberg, Norbert Preining
+# Copyright 2008-2023 Siep Kroonenberg, Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
Modified: trunk/Master/tlpkg/bin/c2b
===================================================================
--- trunk/Master/tlpkg/bin/c2b 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/c2b 2023-02-20 23:40:00 UTC (rev 65994)
@@ -5,4 +5,4 @@
PATH=`echo $PATH | sed -e s,karl/Master,branch/Master,g`
cd $HOME || exit 1 # just in case . is a trunk bin directory
-exec c2l "$@"
+exec c2a "$@"
Modified: trunk/Master/tlpkg/bin/tl-check-wrapper-consistency
===================================================================
--- trunk/Master/tlpkg/bin/tl-check-wrapper-consistency 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-check-wrapper-consistency 2023-02-20 23:40:00 UTC (rev 65994)
@@ -34,7 +34,7 @@
chomp (my $srcdir = `cd $Master/../Build/source/texk/texlive && pwd`);
$cww = "$srcdir/w32_wrapper/runscript.exe";
- $err += &check_w32 ("win32", $cww, %w);
+ $err += &check_w32 ("windows", $cww, %w);
return $err;
}
Modified: trunk/Master/tlpkg/bin/tl-compare-tlpdbs
===================================================================
--- trunk/Master/tlpkg/bin/tl-compare-tlpdbs 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-compare-tlpdbs 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,5 +1,6 @@
#!/usr/bin/env perl
-# Copyright 2008-2015 Norbert Preining
+# $Id$
+# Copyright 2008-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -20,7 +21,7 @@
# packages ignored unless --all is given
# see @critical_pkg_list in tl-update-containers
-my @add_ignored_packs = qw/texlive.infra tlperl.win32/;
+my @add_ignored_packs = qw/texlive.infra tlperl.windows/;
our ($mydir, $vc_id);
my $opt_version = 0;
@@ -116,7 +117,7 @@
=item B<--all>
-Also compare packages C<texlive.infra> and C<tlperl.win32>, which are
+Also compare packages C<texlive.infra> and C<tlperl.windows>, which are
ignored by default.
=item B<--help>
Modified: trunk/Master/tlpkg/bin/tl-fix-container-links
===================================================================
--- trunk/Master/tlpkg/bin/tl-fix-container-links 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-fix-container-links 2023-02-20 23:40:00 UTC (rev 65994)
@@ -85,8 +85,8 @@
$verbose "$f: versioned, skipping."
elif echo $f \
- | egrep '^(texlive\.infra|wintools\.win32).*\.tar\.xz$' >/dev/null; then
- # texlive.infra and wintools.win32 special cases, maybe with arches.
+ | egrep '^(texlive\.infra|wintools\.windows).*\.tar\.xz$' >/dev/null; then
+ # texlive.infra and wintools.windows special cases, maybe with arches.
# some are already linked, but not all.
if echo $f | egrep '\.r[0-9]+\.' >/dev/null; then
$verbose "$f: versioned special, skipped."
Modified: trunk/Master/tlpkg/bin/tl-makeself-from-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-makeself-from-tlnet 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-makeself-from-tlnet 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,6 +1,6 @@
#!/bin/sh -e
# $Id$
-# Copyright 2008-2018 Norbert Preining
+# Copyright 2008-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -200,8 +200,9 @@
elif test -r installer/xz/xz."$b".exe; then
# with .exe, for Cygwin.
cp installer/xz/xz."$b".exe "$t_xzdir/" || exit 1
- elif test "$b" = win32 && test -r installer/xz/xz.exe; then
- # annoyingly, we left .win32 out of the name, special cases all around:
+ elif echo "$b" | egrep 'win32|windows' >/dev/null \
+ && test -r installer/xz/xz.exe; then
+ # annoyingly, we left windows out of the name, special cases all around:
cp installer/xz/xz.exe "$t_xzdir/" || exit 1
cp installer/wget/wget.exe "$t_wgetdir/" || exit 1
cp installer/tar.exe "$t_instdir/" || exit 1
Modified: trunk/Master/tlpkg/bin/tl-update-bindir
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-bindir 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-update-bindir 2023-02-20 23:40:00 UTC (rev 65994)
@@ -185,9 +185,7 @@
universal-darwin)
default_bin_loc=/home/koch/$tlplat.tar.xz
;;
- win32)
- # default_bin_loc=$tmpdir/tl.$tlplat.zip
- # $grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;;
+ windows)
;; # updated by Akira.
x86_64-cygwin)
default_bin_loc=$download_loc
Modified: trunk/Master/tlpkg/bin/tl-update-install-pkg
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-install-pkg 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-update-install-pkg 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# $Id$
-# Copyright 2008-2020 Reinhard Kotucha, Norbert Preining, Karl Berry
+# Copyright 2008-2023 Reinhard Kotucha, Norbert Preining, Karl Berry
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -158,14 +158,14 @@
my %tlpbin = %{$tlpinst->binfiles};
for my $a (keys %tlpbin) {
- next if ($a =~ m/win32/);
+ next if ($a =~ m/windows/);
push (@unix, @{$tlpbin{$a}});
}
-my @win32 = ();
-push (@win32, @unix);
-if (defined $tlpbin{"win32"}) {
- push (@win32, @{$tlpbin{"win32"}});
+my @windows = ();
+push (@windows, @unix);
+if (defined $tlpbin{"windows"}) {
+ push (@windows, @{$tlpbin{"windows"}});
}
@@ -173,7 +173,7 @@
copy_files (@unix);
make_zip ("tgz");
-copy_files (@win32);
+copy_files (@windows);
make_zip ("zip");
make_zip ("nsis");
Modified: trunk/Master/tlpkg/bin/tl-update-nsis
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-nsis 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-update-nsis 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# $Id$
-# Copyright 2008-2019 Norbert Preining
+# Copyright 2008-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -40,7 +40,7 @@
die("Cannot find tlpdb in $Master\n") unless defined($tlpdb);
my $texliveinfra = $tlpdb->get_package("texlive.infra");
- my $texliveinfraw32 = $tlpdb->get_package("texlive.infra.win32");
+ my $texliveinfraw32 = $tlpdb->get_package("texlive.infra.windows");
#
my @allfiles = ();
push(@allfiles, $texliveinfra->all_files);
@@ -133,7 +133,7 @@
print " File $mm\\$dd\\$f\n";
}
}
- print " ExecWait \'\"\$INSTDIR\\bin\\win32\\tlmgr.bat\" _include_tlpobj";
+ print " ExecWait \'\"\$INSTDIR\\bin\\windows\\tlmgr.bat\" _include_tlpobj";
for my $p ($texliveinfra, $texliveinfraw32) {
if (defined $p) {
print " \"\$INSTDIR\\tlpkg\\tlpobj\\", $p->name, ".tlpobj\"";
Modified: trunk/Master/tlpkg/bin/tl-update-tlcritical
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlcritical 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-update-tlcritical 2023-02-20 23:40:00 UTC (rev 65994)
@@ -68,10 +68,10 @@
cd $origdir
}
-# additionally disabled packages
+# update additionally disabled (for normal update) packages
moredis=`grep -v '^\s*#' $master/tlpkg/dev/tlnet-disabled-packages.txt \
| sed -e 's/\s*$//'`
-echo "$0: additional packages from via tlnet-disabled-packages.txt: $moredis"
+echo "$0: additional packages from tlnet-disabled-packages.txt: $moredis"
if test -n "$recreate"; then
echo "$0: $recreate, so cleaning $tlcrit..."
@@ -82,7 +82,7 @@
# update normal containers.
echo "$0: running tl-update-containers (for critical packages)..."
tl-update-containers -location $tlcrit $recreate -all \
- 00texlive.installation 00texlive.config texlive.infra tlperl.win32 \
+ 00texlive.installation 00texlive.config texlive.infra tlperl.windows \
$moredis
else
# this is an option so that if the repository already contains
Modified: trunk/Master/tlpkg/bin/tl-update-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlnet 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-update-tlnet 2023-02-20 23:40:00 UTC (rev 65994)
@@ -20,7 +20,6 @@
chicken=false
cow_shell=/bin/sh
critical=
-pretest=false
recreate=
scheme=full
testinstall=true
@@ -42,7 +41,6 @@
--no-consistency) check_consistency=false;; # takes a long time.
--no-install-pkg) update_install_pkg=false;;# trunk update after freeze
--no-testinstall|-N) testinstall=false;; # and no updates; quit early.
- --pretest) tlweb=/home/ftp/texlive/tlpretest;;
--recreate) recreate=--recreate;;
--scheme) shift; scheme=$1;; # scheme for test install.
--testlocation) shift; tltrybase=$1;;
Modified: trunk/Master/tlpkg/bin/tl-update-tlpdb
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlpdb 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tl-update-tlpdb 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,10 +1,10 @@
#!/usr/bin/env perl
# $Id$
-# Convert a TL tree and *.tlpsrc files into a (possibly updated) texlive.tlpdb.
-#
-# Copyright 2007-2022 Norbert Preining
+# Copyright 2007-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
+#
+# Convert a TL tree and *.tlpsrc files into a (possibly updated) texlive.tlpdb.
BEGIN {
chomp($mydir = `dirname $0`);
@@ -779,10 +779,10 @@
If more than I<integer> files have been changed, do not do any commits
(like C<--no-commit>). The default is 100; that is, if more than 100
-files have been changed, the commit will not be done and a warning
-issued. If by some strange chance more than 100 files actually need to
-be committed, can override with this option (probably by editing
-C<cron.tl>).
+files have been changed, no commit will be done and a warning issued. If
+by some strange chance more than 100 files actually need to be
+committed, you can override with this option (probably best by editing
+C<cron.tl>, if it was part of the nightly build).
=item B<--fix-reverse-revisions>
Modified: trunk/Master/tlpkg/bin/tlprm
===================================================================
--- trunk/Master/tlpkg/bin/tlprm 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/bin/tlprm 2023-02-20 23:40:00 UTC (rev 65994)
@@ -1,8 +1,6 @@
#!/usr/bin/env perl
# $Id$
-# Copyright 2007-2019 Karl Berry.
-# This file is licensed under the GNU General Public License version 2
-# or any later version.
+# Public domain. Originally written 2007, Karl Berry.
#
# Remove a package from the TeX Live source repository. We use this on
# the source tree when a package becomes obsolete, gets merged, or
@@ -109,7 +107,7 @@
`echo $Master/tlpkg/libexec/ctan2tds >>$commit_file`;
print "\nsvn remove `cat $rm_file`\n";
- print "svn commit -m'rm $f, REASON' `cat $commit_file`\n";
+ print "svn commit -m\"rm $f, \$REASON\" `cat $commit_file`\n";
if (1) { # maybe only if debugging?
print "\n\f ", @removals + 0, " removals ($rm_file):\n";
Modified: trunk/Master/tlpkg/doc/releng.txt
===================================================================
--- trunk/Master/tlpkg/doc/releng.txt 2023-02-20 23:33:38 UTC (rev 65993)
+++ trunk/Master/tlpkg/doc/releng.txt 2023-02-20 23:40:00 UTC (rev 65994)
@@ -51,7 +51,8 @@
lib/printversion.c
check *.c *.h sources in above for needed copyright year updates too.
check tlpkg/dev/srclist.txt for automake major version update.
- check tlpkg/installer/curl/curl-ca-bundle.crt for update.
+ check tlpkg/installer/curl/curl-ca-bundle.crt for update,
+ at https://curl.se/ca, though should have been done by tl-update-auto.
then reautoconf (~4min), rebuild (~25min).
install-tl, tlmgr.pl (copyright only)
run ~karl/bin/tlversions to see+compare engine/etc. versions
@@ -146,7 +147,7 @@
egrep -i 'ERROR|failed' /tmp/fua
6b. (For karl at tug.org: leave new ~karl/.texlive`date +%Y` for bnb.
-Also run mtxrun --generate to be able to run ConTeXt.)
+Also run mtxrun --generate>&/tmp/mtxgen to be able to run ConTeXt.)
7. Check for Build-maintained updates to config files, new files, etc.
(might have to merge back if Master was mistakenly updated):
@@ -167,9 +168,9 @@
8a. svn commit all the above.
-9. After a trial build goes ok, set up tlpretest:
+9. After the trial build goes ok, set up tlpretest:
cd /home/ftp/texlive/tlpretest
- cp -ar ../tlnet/[a-u]* . # omit tlnet/README*
+ cp -ar ../tlnet/[a-u]* . # omit tlnet/README*; about 3min
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
@@ -190,18 +191,23 @@
10. As of 2021, we want to keep updating tlnet from the new branch, as
described in item I.6. For safety, let's do a trial build from the new
-branch to a temporary destination, say /home/texlive/tmp, before
-updating the real tlnet. Initialize the tmp dir as above with
-tlpretest, item 9):
- mkdir /home/texlive/tmp
- cd /home/texlive/tmp
+branch to a temporary destination, say /home/texlive/trial-tlnet, before
+updating the real tlnet. Initialize this dir as above with tlpretest, item 9:
+ mkdir /home/texlive/trial-tlnet
+ cd /home/texlive/trial-tlnet
+ chmod g-s .
rm -rf *
time cp -ar ~ftp/texlive/tlnet/[a-u]* . # omit tlnet/README*
-
-10a. Edit ~karl/bin/cron.tl:
-- use /home/texlive/tmp instead of $ftp/tlnet for tlnet_dir;
-- add --testlocation=/home/texlive/trial to the tl-update-tlnet invocation.
+ umask 002
+ chmod -R u+w,go-w,a+rX-st --changes * # avoid lots of chmods in cron.tl
+ #
+ # also make an empty working directory for the build:
+ mkdir /home/texlive/trial-work
+10a. Edit ~karl/bin/cron.tl (these trial values are commented out):
+- use /home/texlive/trial-tlnet instead of $ftp/tlnet for tlnet_dir;
+- add --testlocation=/home/texlive/trial-work to tl-update-tlnet invocation.
+
10b. To do the test branch build:
env force_rebuild=true cron.branch
Assuming it goes ok, then undo the edits.
@@ -213,7 +219,7 @@
In the crontab, enable the pretest entries,
and re-enable cron.synctl.
-12. Life and daily updates resume: run c2l to update trunk->tlpretest,
+12. Life and daily updates resume: run c2a to update trunk->tlpretest,
c2b to update branch->tlnet. Of course, don't update the branch if a
particular package requires the new binaries, e.g., asymptote.
More information about the tex-live-commits
mailing list.