From eee11661f01345c92b64fcc7023c096a15d44c53 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 24 Mar 2020 20:57:53 +0000 Subject: tl-update-tlnet: also set TEXMFVAR and TEXMFCACHE, used by luaotfload. tl-update-tlpdb: report new and old cataloguedata. git-svn-id: svn://tug.org/texlive/trunk@54528 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-update-tlnet | 12 +++++++++--- Master/tlpkg/bin/tl-update-tlpdb | 7 +++++-- Master/tlpkg/doc/releng.txt | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'Master') diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 2f244d4f254..0cda45f2a17 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -156,13 +156,18 @@ tltryinst=$tltrybase/tlinst.try zcat $tltry/install-tl-unx.tar.gz | tar -xf - cd install-tl-* # subdir is YYYYMMDD -# create TL install profile: + +# create TL install profile. We set TEXMFCACHE for the sake of +# luaotfload-tool, although it should fall back to TEXMFVAR, +# which is possibly used by nothing else. echo "# texlive-profile from $0 selected_scheme scheme-$scheme TEXDIR $tltryinst/$yyyy +TEXMFLOCAL $tltryinst/texmf-local TEXMFSYSCONFIG $tltryinst/$yyyy/texmf-config TEXMFSYSVAR $tltryinst/$yyyy/texmf-var -TEXMFLOCAL $tltryinst/texmf-local +TEXMFVAR $tltryinst/$yyyy/texmf-uvar +TEXMFCACHE $tltryinst/$yyyy/texmf-cache TEXMFHOME ~/texmf tlpdbopt_install_docfiles 1 tlpdbopt_install_srcfiles 1 @@ -177,7 +182,8 @@ TEXLIVE_INSTALL_ENV_NOCHECK=1; export TEXLIVE_INSTALL_ENV_NOCHECK TEXLIVE_INSTALL_NO_WELCOME=1; export TEXLIVE_INSTALL_NO_WELCOME # Minimal PATH from here on! E.g., we don't want the test install to -# find our own mktexlsr, but only have the programs in the test available. +# find its own mktexlsr, but only have the programs in the test +# environment available. PATH=/usr/bin tlnet_install_log=`pwd`/update-tlnet-install.log diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb index 3a7e00b1e29..cc579960975 100755 --- a/Master/tlpkg/bin/tl-update-tlpdb +++ b/Master/tlpkg/bin/tl-update-tlpdb @@ -573,7 +573,7 @@ sub tlpobj_catalogue_equal { my $ret = 0; my $pkg = $tlpA->name; # just for debugging output - debug("$pkg: comparing catalogue info:\n"); + ddebug("$pkg: comparing catalogue info:\n"); # The shortdesc and longdesc usually come from the Catalogue, # but sometimes are in the tlpsrc. @@ -593,7 +593,10 @@ sub tlpobj_catalogue_equal { debug("$pkg: catalogue value changed\n"); } elsif (! &equal_hashes($tlpA->cataloguedata, $tlpB->cataloguedata)) { - debug("$pkg: cataloguedata changed\n"); + debug("$pkg: ", debug_hash_str("cataloguedata now", $tlpA->cataloguedata), + " " x (length($pkg) + 7), + debug_hash_str("vs. compare db", $tlpB->cataloguedata)); + } elsif (! &equal_hashes($tlpA->docfiledata, $tlpB->docfiledata)) { debug("$pkg: docfiledata changed\n"); diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt index 93522f6cb50..c4c661076a7 100644 --- a/Master/tlpkg/doc/releng.txt +++ b/Master/tlpkg/doc/releng.txt @@ -285,9 +285,10 @@ O. Two days before the final pretest (i.e., to-be-published) build: Put date into NEWS and ChangeLog files. Update Build/source/tardate.ac. tlmgr version number in texmf-dist/scripts/texlive/NEWS. + In cron.tl, set catalogue_compare=true for final sync. Rebuild test images so we get the new source. Tell developers no more commits: tldev + - hironobu, jerome, luigi, mojca, takuji. + hironobu, luigi, mojca, takuji. P. The day before the final pretest: option adjustrepo 1 in tl-update-tlnet, else install-tl-unx won't go to ctan -- cgit v1.2.3