summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-20 23:40:00 +0000
committerKarl Berry <karl@freefriends.org>2023-02-20 23:40:00 +0000
commita6e0e3adb1a4017c5bc0f98dc135bef52207ab18 (patch)
tree5207d3cff61dbd1d60852040f97e050e59784016
parent127443c8fdec56ad7ca6988cf47b62467675eac8 (diff)
more win32->windows, doc, copyright 2023
git-svn-id: svn://tug.org/texlive/trunk@65994 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLCrypto.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLTREE.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm2
-rwxr-xr-xMaster/tlpkg/bin/c2b2
-rwxr-xr-xMaster/tlpkg/bin/tl-check-wrapper-consistency2
-rwxr-xr-xMaster/tlpkg/bin/tl-compare-tlpdbs7
-rwxr-xr-xMaster/tlpkg/bin/tl-fix-container-links4
-rwxr-xr-xMaster/tlpkg/bin/tl-makeself-from-tlnet7
-rwxr-xr-xMaster/tlpkg/bin/tl-update-bindir4
-rwxr-xr-xMaster/tlpkg/bin/tl-update-install-pkg14
-rwxr-xr-xMaster/tlpkg/bin/tl-update-nsis6
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlcritical6
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlpdb14
-rwxr-xr-xMaster/tlpkg/bin/tlprm6
-rw-r--r--Master/tlpkg/doc/releng.txt34
18 files changed, 60 insertions, 58 deletions
diff --git a/Master/tlpkg/TeXLive/TLCrypto.pm b/Master/tlpkg/TeXLive/TLCrypto.pm
index cb31e1efc5f..a4ca72413f4 100644
--- a/Master/tlpkg/TeXLive/TLCrypto.pm
+++ b/Master/tlpkg/TeXLive/TLCrypto.pm
@@ -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.
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index fc632329028..dab1ade3e6a 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -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.
diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm
index 7d409b4d9c5..c16034ea964 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -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.
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 151bb1a153f..99b251a8b1a 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -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.
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index 41c3f85b724..1517aee2f96 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -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.
diff --git a/Master/tlpkg/bin/c2b b/Master/tlpkg/bin/c2b
index 90e9e24c085..c48480085fa 100755
--- a/Master/tlpkg/bin/c2b
+++ b/Master/tlpkg/bin/c2b
@@ -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 "$@"
diff --git a/Master/tlpkg/bin/tl-check-wrapper-consistency b/Master/tlpkg/bin/tl-check-wrapper-consistency
index 59e6cb0b3f4..e5d12532323 100755
--- a/Master/tlpkg/bin/tl-check-wrapper-consistency
+++ b/Master/tlpkg/bin/tl-check-wrapper-consistency
@@ -34,7 +34,7 @@ sub main {
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;
}
diff --git a/Master/tlpkg/bin/tl-compare-tlpdbs b/Master/tlpkg/bin/tl-compare-tlpdbs
index 4632280e9fb..fd66ecae208 100755
--- a/Master/tlpkg/bin/tl-compare-tlpdbs
+++ b/Master/tlpkg/bin/tl-compare-tlpdbs
@@ -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 @@ use Pod::Usage;
# 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 @@ tl-compare-tlpdbs [I<option>]... <TLPDB1> [<TLPDB2>]
=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>
diff --git a/Master/tlpkg/bin/tl-fix-container-links b/Master/tlpkg/bin/tl-fix-container-links
index cb639cd6162..8c488f777fb 100755
--- a/Master/tlpkg/bin/tl-fix-container-links
+++ b/Master/tlpkg/bin/tl-fix-container-links
@@ -85,8 +85,8 @@ for f in *; do
$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."
diff --git a/Master/tlpkg/bin/tl-makeself-from-tlnet b/Master/tlpkg/bin/tl-makeself-from-tlnet
index cb416dc59bf..1b0b71a3ba9 100755
--- a/Master/tlpkg/bin/tl-makeself-from-tlnet
+++ b/Master/tlpkg/bin/tl-makeself-from-tlnet
@@ -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 @@ if test -r "$ROOT/tlpkg/texlive.tlpdb" && test -d "$ROOT/tlpkg/tlpobj/"; then
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
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 0f10db6ef9d..710531ec115 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -185,9 +185,7 @@ for tlplat in $tlplats; do
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
diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg
index a1743d5d5a5..a983991f92e 100755
--- a/Master/tlpkg/bin/tl-update-install-pkg
+++ b/Master/tlpkg/bin/tl-update-install-pkg
@@ -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 @@ if ($opt_texlivedocs) {
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 @@ if (defined $tlpbin{"win32"}) {
copy_files (@unix);
make_zip ("tgz");
-copy_files (@win32);
+copy_files (@windows);
make_zip ("zip");
make_zip ("nsis");
diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis
index 0b121f48228..6a493977f31 100755
--- a/Master/tlpkg/bin/tl-update-nsis
+++ b/Master/tlpkg/bin/tl-update-nsis
@@ -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 @@ sub main {
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 @@ EOF
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\"";
diff --git a/Master/tlpkg/bin/tl-update-tlcritical b/Master/tlpkg/bin/tl-update-tlcritical
index a5e2a6f128f..660056926f9 100755
--- a/Master/tlpkg/bin/tl-update-tlcritical
+++ b/Master/tlpkg/bin/tl-update-tlcritical
@@ -68,10 +68,10 @@ do_updater ()
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 @@ if $opt_do_containers; then
# 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
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 7b1981bc26a..cfc6607fe07 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -20,7 +20,6 @@ check_consistency=true
chicken=false
cow_shell=/bin/sh
critical=
-pretest=false
recreate=
scheme=full
testinstall=true
@@ -42,7 +41,6 @@ while test $# -gt 0; do
--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;;
diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb
index 873ab440431..433c4bce13b 100755
--- a/Master/tlpkg/bin/tl-update-tlpdb
+++ b/Master/tlpkg/bin/tl-update-tlpdb
@@ -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 @@ invoked at all if the dump is read.
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>
diff --git a/Master/tlpkg/bin/tlprm b/Master/tlpkg/bin/tlprm
index 750555de475..d19cbfebc94 100755
--- a/Master/tlpkg/bin/tlprm
+++ b/Master/tlpkg/bin/tlprm
@@ -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 @@ sub main {
`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";
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 20d9ae74e7c..3a0032b0275 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -51,7 +51,8 @@ affecting production dirs, see:
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 @@ fmtutil-user --all >&/tmp/fua
egrep -i 'ERROR|failed' /tmp/fua
6b. (For karl@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 @@ When removing platforms, have to remove from /home/texlive/trunk.
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,17 +191,22 @@ This was a one-time event, but left here as an example for the unknown future.
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
@@ -213,7 +219,7 @@ we won't be installing binaries from a build.
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.