summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-03-08 22:59:35 +0000
committerKarl Berry <karl@freefriends.org>2022-03-08 22:59:35 +0000
commit871e3a91b332158dcf4feff37ffb24393a675a6b (patch)
tree3abd537e579d731c9bcae657c403cbd54971a984 /Master/tlpkg
parent32701a4c86812d8b27828263ecc4b515fbf35a0d (diff)
doc updates
git-svn-id: svn://tug.org/texlive/trunk@62529 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm14
-rwxr-xr-xMaster/tlpkg/bin/tl-update-asy2
-rw-r--r--Master/tlpkg/doc/releng.txt18
3 files changed, 19 insertions, 15 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index f251ba66402..252f2295b08 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1645,27 +1645,29 @@ sub time_estimate {
return($remtime, $tottime);
}
-
+
=item C<install_packages($from_tlpdb, $media, $to_tlpdb, $what, $opt_src, $opt_doc, $retry, $continue)>
Installs the list of packages found in C<@$what> (a ref to a list) into
the TLPDB given by C<$to_tlpdb>. Information on files are taken from
the TLPDB C<$from_tlpdb>.
-C<$opt_src> and C<$opt_doc> specify whether srcfiles and docfiles should be
-installed (currently implemented only for installation from uncompressed media).
+C<$opt_src> and C<$opt_doc> specify whether srcfiles and docfiles should
+be installed (currently implemented only for installation from
+uncompressed media).
If C<$retry> is trueish, retry failed packages a second time.
If C<$continue> is trueish, installation failure of non-critical packages
-will be ignored.
+will be ignored (success is returned).
Returns 1 on success and 0 on error.
=cut
sub install_packages {
- my ($fromtlpdb,$media,$totlpdb,$what,$opt_src,$opt_doc, $opt_retry, $opt_continue) = @_;
+ my ($fromtlpdb,$media,$totlpdb,$what,
+ $opt_src,$opt_doc,$opt_retry,$opt_continue) = @_;
my $container_src_split = $fromtlpdb->config_src_container;
my $container_doc_split = $fromtlpdb->config_doc_container;
my $root = $fromtlpdb->root;
@@ -1744,7 +1746,7 @@ sub install_packages {
if (!$fromtlpdb->install_package($package, $totlpdb)) {
if ($opt_continue) {
push @::installation_failed_packages, $package;
- tlwarn("Failed to install $package, but continue anyway!\n");
+ tlwarn("Failed to install $package, but continuing anyway!\n");
} else {
return 0;
}
diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy
index 109c129954f..13aad645cb7 100755
--- a/Master/tlpkg/bin/tl-update-asy
+++ b/Master/tlpkg/bin/tl-update-asy
@@ -66,7 +66,7 @@ elif test "x$1" = x--build; then
rm -rf /tmp/ainst autom4te.cache
./configure --prefix=/tmp/ainst \
--with-latex=/tmp/ainst/latex --with-context=/tmp/ainst/context \
- --disable-fftw --disable-gl --disable-gsl \
+ --disable-fftw --disable-gl --disable-gsl --disable-lsp \
--enable-texlive-build CFLAGS=-g CXXFLAGS=-std=c++17 #-ansi
make
make check
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index bddac781d73..22683eb6ac6 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -259,26 +259,28 @@ M. As pretest proceeds, update the doc:
any new people to thank,
and changes throughout if behavior has changed.
Update tlbuild.texi text, then
- W=.../Build/source/Work
+ xs=.../Build/source
+ W=$xs/Work
make -C $W/doc script-links tlbuild-incl.texi readme-files readme-install
- #cd .../Build/source
Consider updates of core man pages in Build/source/texk/web2c/man.
Remake updmap,fmtutil man pages with help2man (install latest from source):
tm=.../Master
make -C $W/texk/texlive/tl_support xupdmap.1 xfmtutil.1
x1=`(unset CDPATH; cd $tm/texmf-dist/doc/man/man1; pwd)`
- They must be moved from /tmp into Master by hand:
- mv /tmp/xupdmap.1 $x1/updmap.1
- mv /tmp/xfmtutil.1 $x1/fmtutil.1
+ They must be moved from /tmp into both Master and Build by hand:
+ cp -p /tmp/xupdmap.1 $x1/updmap.1
+ cp -p /tmp/xfmtutil.1 $x1/fmtutil.1
+ cp -p /tmp/xupdmap.1 $xs/texk/texlive/tl_support/updmap.1
+ cp -p /tmp/xfmtutil.1 $xs/texk/texlive/tl_support/fmtutil.1
Also update them in ~www/texlive/doc/*.html:
- mv /tmp/xupdmap.1.html $lw/doc/updmap.html
- mv /tmp/xfmtutil.1.html $lw/doc/fmtutil.html
+ cp -p /tmp/xupdmap.1.html $lw/doc/updmap.html
+ cp -p /tmp/xfmtutil.1.html $lw/doc/fmtutil.html
While we're here, let's update the other generated html files:
xx=$tm/texmf-dist/scripts/texlive
pod2html --cachedir=/tmp $xx/tlmgr.pl >$lw/doc/tlmgr.html
pod2html --cachedir=/tmp $tm/install-tl >$lw/doc/install-tl.html
Update copies in the Master tree (also done nightly in tl-update-auto):
- cp $lw/doc/{tlmgr,install-tl}.html $tm/texmf-dist/doc/texlive
+ cp -pf $lw/doc/{tlmgr,install-tl}.html $tm/texmf-dist/doc/texlive
Man pages from Build to Master (after doing a build):
tl-update-man # consider removals from output, if any binaries are gone
# check /tmp/so.rules against man1/Makefile, update if needed.