2020 pretest setup

git-svn-id: svn://tug.org/texlive/trunk@53998 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 38 insertions, 33 deletions

diff --git a/Master/tlpkg/bin/c2l b/Master/tlpkg/bin/c2l
index c90c2bfa6b0..a01abc2e3f5 100755
--- a/Master/tlpkg/bin/c2l
+++ b/Master/tlpkg/bin/c2l
@@ -56,15 +56,16 @@ sub main {
     $arg = "x86_64-linuxmusl";
 
   } elsif ($arg eq "norbert" || $arg eq "nor") {
-    for my $p (qw(i386-linux x86_64-linux x86_64-linuxmusl)) {
+    for my $p (qw(i386-linux x86_64-linux)) {
       system ("$0 $p") && die "norbert/$p failed";
     }
     print "$0: norbert updates done.\n";
     exit 0;
   
-  } elsif ($arg eq "cg") { # mojca
+  } elsif ($arg eq "cg" || $arg eq "mojca") {
     for my $p (qw(i386-freebsd amd64-freebsd
                   x86_64-darwinlegacy
+                  x86_64-linuxmusl
                   i386-solaris x86_64-solaris)) {
       system ("$0 $p") && die "cg/$p failed";
     }
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 57ae42e1943..7cad83ef128 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -101,17 +101,17 @@ for tlplat in $tlplats; do
    aarch64-linux)
     default_bin_loc=$download_loc
     #https://faubox.rrze.uni-erlangen.de/open/MjdwNXE5NW5UcTU4RzVIWlRVUVVI/branch2018/texlive_bin_aarch64-linux.tar.xz
-    $grab http://51.158.66.174:8080/texlive_bin_aarch64-linux.tar.xz;;
+    #http://51.158.66.174:8080/texlive_bin_aarch64-linux.tar.xz
+    remurl=https://aekahwai.spdns.org/online/texlive_bin_aarch64-linux.tar.xz
+    $grab $remurl;;
    alpha-linux)
     default_bin_loc=/home/preining/alpha-linux.tar.gz;;
    amd64-freebsd)
-    download_loc=$tmpdir/tl.$tlplat.tar.xz
     default_bin_loc=$download_loc
-    grab="$download -O $download_loc"
-    $grab https://www.preining.info/amd64-freebsd11.tar.gz;;
-    #$grab http://anthesphoria.net/FreeBSD/TeXLive-Devel/amd64-freebsd7.tar.xz;;
-    #remurl=http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz
-    #$grab $remurl;;
+    #https://www.preining.info/amd64-freebsd11.tar.gz
+    #http://anthesphoria.net/FreeBSD/TeXLive-Devel/amd64-freebsd7.tar.xz
+    remurl=http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz
+    $grab $remurl;;
    amd64-kfreebsd)
     download_loc=$tmpdir/tl.$tlplat.tar.xz
     default_bin_loc=$download_loc
@@ -149,7 +149,8 @@ for tlplat in $tlplats; do
    i386-linux)
     default_bin_loc=$download_loc
     #remurl=http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz
-    remurl=`curl -s https://api.github.com/repos/TeX-Live/texlive-source/releases/latest | grep browser_download_url | grep texlive-bin-i386-linux.tar.gz | cut -d : -f 2,3 | tr -d \"`
+    remurl=`curl -s https://api.github.com/repos/TeX-Live/texlive-source/releases/svn53987 | grep browser_download_url | grep texlive-bin-i386-linux.tar.gz | cut -d : -f 2,3 | tr -d \"`
+    remurl=https://github.com/TeX-Live/texlive-source/releases/download/svn53987/texlive-bin-i386-linux.tar.gz
     $grab $remurl;;
    i386-linuxmusl)
     default_bin_loc=$download_loc
@@ -201,18 +202,22 @@ for tlplat in $tlplats; do
     #   "Target:trunk" should already be there,
     #   brief msg from that commit in "title",
     #   and anything relevant for "description", or leave it blank;
-    #   then "Publish release".
-    # After ~30min max, should have new release at:
+    #   then "Publish release" (maybe as pre-release).
+    # After ~30min max, should have new release tarballs at:
     #   https://github.com/TeX-Live/texlive-source/releases
+    # If failure, check:
+    #   https://www.travis-ci.org/TeX-Live/texlive-source
     #   
     # If try before ready, no harm, just get error message "missing url".
     # (If you have/want a git checkout of texlive-source, see tlbuild doc.)
     # 
-    remurl=`curl -s https://api.github.com/repos/TeX-Live/texlive-source/releases/latest | grep browser_download_url | grep texlive-bin-x86_64-linux.tar.gz | cut -d : -f 2,3 | tr -d \"`
+    remurl=`curl -s https://api.github.com/repos/TeX-Live/texlive-source/releases/tag/svn53987 | grep browser_download_url | grep texlive-bin-x86_64-linux.tar.gz | cut -d : -f 2,3 | tr -d \"`
+    remurl=https://github.com/TeX-Live/texlive-source/releases/download/svn53987/texlive-bin-x86_64-linux.tar.gz
     $grab $remurl;;
    x86_64-linuxmusl)
     default_bin_loc=$download_loc
     remurl=`curl -s https://api.github.com/repos/TeX-Live/texlive-source/releases/latest | grep browser_download_url | grep texlive-bin-x86_64-musl.tar.gz | cut -d : -f 2,3 | tr -d \"`
+    remurl=http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz
     $grab $remurl;;
    x86_64-solaris)
     default_bin_loc=$download_loc
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 84591a980ba..a62567f15b2 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -80,10 +80,8 @@ Empty tlpretest except for that README and 00_TIME.txt (used for mirmon).
 2. Prepare for pretest in cron.tl:
 critical=--critical	 # push tlcritical, if needed/desired
 pretest=--pretest	 # update tlpretest, not tlnet (if not frozen)
-catalogue_update=true    # at least the first day, resync catalogue
-net_frozen=false 	 # update tlnet|tlpretest (per $pretest)
-(tlcritical will remain getting updated daily, even though it doesn't
- work with tlnet any more.  That's ok.  Or disable if you prefer.)
+catalogue_update=false   # just for the initial test, will set below
+net_frozen=true 	 # update tlnet|tlpretest (per $pretest)
 First build happens below, after many more changes; don't start it yet.
 
 4. After setting up for pretest (not before), basic updates for release year:
@@ -101,18 +99,18 @@ Master/texmf-dist/web2c/texmfcnf.lua
 Master/texmf-dist/web2c/texmf.cnf  # from Build/.../kpathsea
 
 5. Ensure version numbers in sources are updated; see list above.
-Then install new binaries with tl-update-bindir.
+Then install new binaries with tl-update-bindir. Ask tlbuild.
 Add new executables to appropriate .tlpsrc files (likewise removals).
 Add new scripts to linked_scripts if not already handled.
 
 6. Run tex \\end to check that mktexfmt works. 
-Also run fmtutil -user --all to check that all formats build, no config file
+Also run fmtutil-user --all to check that all formats build, no config file
 problems.  Ensure that web2c/texmf.cnf is updated for the current year
 (per above).  Then, so things will get redone later as another check:
   rm -rf ~/.texlive`date +%Y`  # the new one
 
-7. Check for Build-maintained updates to config files, etc.
-(and might have to merge back if Master was mistakenly updated):
+7. Check for Build-maintained updates to config files, new files, etc.
+(might have to merge back if Master was mistakenly updated):
   diff -ru0 --exclude=man --exclude=info \
     Build/source/inst/texmf-dist Master/texmf-dist
 
@@ -122,27 +120,27 @@ for p in *conv hbf2gf; do cp /home/ftp/tex-archive/language/chinese/CJK/cjk-X.Y.
 
 8. Now, finally, try a first update of tlpretest:
   force_rebuild=true cron.tl
-This will fail because pretest is not set up, but that's ok; the idea is
-to check the output and ensure all is as basically ok.
+This will fail because the pretest dir is not completely set up, but
+that's ok; the idea is to check the output and ensure all is basically ok.
+It's likely that .tlpsrc files will need to be adjusted.
 
 8a. svn commit all the above.
 
 9. After that trial build looks ok, set in cron.tl:
-catalogue_update=true  # to get catalogue updates; then revert.
+net_frozen=false
    And do:
 mkdir /home/ftp/texlive/tlpretest/tlpkg
 touch !$/texlive.tlpdb
 force_rebuild=true cron.tl
 
-10. After first rebuild success, back to catalogue_update=false.
-Life and daily updates go on.
+10. Life and daily updates go on.
 
 A. At some point, after tlnet freeze:
   Update gpg expiration, see tlpkg/gpg/tl-key-extension.txt.
   Run tl-update-linked-scripts to ensure consistency.
   In Master/tlpkg, update bundled Windows programs as needed:
     dviout texworks tlgs tlperl tlpsv
-  In tlpkg/installer, update xz and wget if needed (+ Master/source).
+  In tlpkg/installer, update xz lz4 wget if needed (+ Master/source).
   Update readme-html.dir/readme.en.html if needed,
     run tlpkg/bin/htmltext to create readme-txt.dir/README.EN.
 
@@ -220,6 +218,7 @@ P. The day before the final pretest:
 
 Q. After final build, to do total freeze:
   In cron.tl, set *_frozen=true.
+  Also, set catalogue_update=false now or at some point earlier.
   Don't disable the cron entry, since we want to see if any commits
   are mistakenly made. Nothing more than svn update will happen
   with everything frozen.
@@ -324,7 +323,7 @@ update ~www/texlive web pages (search for $prev and $prev-1):
   upgrade.html - whether possible or not
   tlmgr-news.html - from texmf-dist/scripts/texlive/NEWS
   index.html - dates
-check for new Texinfo manuals to link to html versions:
+check for new Texinfo manuals to link to html versions, and update existing:
   ~www/texinfohtml/
 further web updates below.
 
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 6d2d0438391..0b8975f87e0 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -43,7 +43,7 @@ tlpsetvar global_luatex_deps cm,etex,hyphen-base,knuth-lib,plain,\
 tex-ini-files,unicode-data
 #
 # Platforms that don't support jit.
-tlpsetvar global_no_luajit_platforms x86_64-solaris
+tlpsetvar global_no_luajit_platforms x86_64-darwinlegay,x86_64-solaris
 #
 # We define the Windows platform names here, so we can use ${wndws} in
 # the patterns, in preparation for supporting w64 in addition to w32,
diff --git a/Master/tlpkg/tlpsrc/xdvi.tlpsrc b/Master/tlpkg/tlpsrc/xdvi.tlpsrc
index c4fdda3088b..1fe84aaa87d 100644
--- a/Master/tlpkg/tlpsrc/xdvi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xdvi.tlpsrc
@@ -1,7 +1,7 @@
 category TLCore
 
-binpattern f bin/${ARCH}/xdvi
-binpattern f bin/${ARCH}/xdvi-*
+binpattern f/!x86_64-darwinlegacy bin/${ARCH}/xdvi
+binpattern f/!x86_64-darwinlegacy bin/${ARCH}/xdvi-*
 #
 runpattern d texmf-dist/dvips/xdvi
 runpattern d texmf-dist/xdvi
diff --git a/Master/tlpkg/tlpsrc/xpdfopen.tlpsrc b/Master/tlpkg/tlpsrc/xpdfopen.tlpsrc
index 1c9efadf18b..045fb3f6108 100644
--- a/Master/tlpkg/tlpsrc/xpdfopen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xpdfopen.tlpsrc
@@ -1,7 +1,7 @@
 category TLCore
 
-binpattern f bin/${ARCH}/pdfclose
-binpattern f bin/${ARCH}/pdfopen
+binpattern f/!x86_64-darwinlegacy bin/${ARCH}/pdfclose
+binpattern f/!x86_64-darwinlegacy bin/${ARCH}/pdfopen
 #
 # Needed on Windows.
 binpattern f bin/win32/pdfdde.exe