release doc, missed source upate

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

1 files changed, 49 insertions, 45 deletions

diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index f62d4da323b..809c9d1ed7e 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -306,19 +306,15 @@ Z. After final build, to do total freeze:
   Also, in /l/bin/mirror-ctan, disable Catalogue updates,
    to avoid unnecessary changes if we have to rebuild the final image.
 
-Z0. Ask for torrents to be created. In 2020,
+Z0. Ask for torrents to be created. In 2021,
   Tim Stewart <timoteostewart1977@gmail.com>
   made the one that worked.
 
-Z1. Preserve final tlnet of current release YYYY:
-cd /home/ftp/texlive/tlnet
-cp -ar ../tlnet /home/ftp/historic/systems/texlive/YYYY/tlnet-final
-# if post-freeze updates are required (let's hope not),
-# see tlpkg/archive/tlnet-by-hand.txt.
-
-Z2. Also preserve Catalogue as of the freeze, again for the sake of
+Z1. Preserve Catalogue as of the freeze, for the sake of
     post-freeze updates:
 rsync -ar /home/httpd/html/catalogue /home/texlive/catalogue-freeze
+    If such post-freeze updates are required (let's hope not),
+    see tlpkg/archive/tlnet-by-hand.txt.
 
 
  Part III. Making the big release:
@@ -338,7 +334,7 @@ cp README.md $hx/$prev/
 mv -v *.iso* *.torrent* $hx/$prev/
 mv -v test/texlive*.iso* .
 mv -v test/texlive*.tar.xz* $hx/$this/	# tar version only in historic
-update README (touch even if no real changes needed)
+update README.md (touch even if no real changes needed)
    and test/README (pretest over)
 
 - mactex (from tlpretest)
@@ -357,30 +353,25 @@ chgrp mactex *; chmod g+w *
 mkdir $hm/$this/
 cp -v Extras*.pdf MacTeXtras-*.zip $hm/$this
 
-- move rest of tlnet to historic:
+- move rest of tlnet to historic, as tlnet-final:
+(We keep updating the $prev release while doing the pretest for $this,
+ so just moving the current tlnet is what's needed.)
+mkdir $hx/$prev/tlnet-final
+chgrp texlive !$
+chmod g+s !$
 cd /home/ftp/texlive/tlnet
-# depending on when it was created, the tlnet-final/ dir might not have
-# been 100% final, so might contain older versions of any packages that
-# got last-minute updates. No harm in either leaving them or removing them.
-diff -qr . $hx/$prev/tlnet-final # should be identical, so:
-rm -rf [a-z]*  # yes, really, but double-check you're in the right directory...
+mv [a-z]* $hx/$prev/tlnet-final
 mv ../tlpretest/[a-z]* .
-update README (touch even if no real changes needed)
-   and ../tlpretest/README (pretest over)
+update README.md (touch even if no real changes needed)
+   and ../tlpretest/README.md (pretest over)
 cp install-tl-unx.tar.gz install-tl.zip $hx/$this/
 
 - Source directory for CTAN:
 fx=/home/ftp/tex
-rm -f $fx/texlive/Source/*
-cp -a $tm/source/{install-tl,texlive-,w32tex-}*z $fx/texlive/Source/
-
-- update local CTAN area, just to avoid mirroring everything back again:
-cy=/home/ftp/tex-archive/systems
-rm -rf $cy/texlive/tlnet/*; cp -ar * $cy/texlive/tlnet/
-rm $cy/texlive/Images/*; cp -a ../Images/*.* $cy/texlive/Images/
-rm $cy/texlive/Source/*; cp -a $tm/source/{install-tl,texlive-,w32tex-}*z $cy/texlive/Source/
-rm $cy/mac/mactex/*; cp -a $fx/mactex/* $cy/mac/mactex/
-cp -a $fx/protext/dist/* $cy/windows/protext/ # probably already done
+ls $fx/texlive/Source/* # ensure last year's sources
+rm -f !$
+cp -av $tm/source/{install-tl,texlive-,w32tex-}*z $fx/texlive/Source/
+cp -av $tm/source/{install-tl,texlive,w32tex}*README $fx/texlive/Source/
 
 - historic copy of TL web pages:
 cd /home/httpd/html/texlive
@@ -390,20 +381,31 @@ cp *.html !$  # disable header.html include in bugs.html
 - copy full (unpruned) tlpdb to historic:
 # the pre-pruned tlpdb directory is created by tl-update-images.
 preprune=/home/ftp/texlive/Images/test/preprune-tlpdb
-ls -l $preprune
-tgz=/tmp/texlive-${this}0406-tlpdb-full.tar.gz # whatever date
+ls -l $preprune # ensure tlpdb and xz and checksums
+tgz=/tmp/texlive-${this}0325-tlpdb-full.tar.gz # release date, not today's
 (cd $preprune && tar cvzf $tgz texlive.tlpdb texlive.tlpdb.*5*)
 mv $tgz $hx/$this/
 rm -rf $preprune
 
+- update local CTAN area, just to avoid mirroring everything back again:
+cy=/home/ftp/tex-archive/systems
+rm -rf $cy/texlive/tlnet/*; cp -ar * $cy/texlive/tlnet/
+rm $cy/texlive/Images/*; cp -a ../Images/*.* $cy/texlive/Images/
+rm $cy/texlive/Source/*; cp -a $tm/source/{install-tl,texlive-,w32tex-}*z $cy/texlive/Source/
+rm $cy/mac/mactex/*; cp -a $fx/mactex/* $cy/mac/mactex/
+
 - tug.org stuff:
 change fstab 
 mount /mnt/tl
 cd /mnt/tl
-echo i | nice -19 perl install-tl # do full install to default location.
+TEXLIVE_INSTALL_NO_WELCOME=1; export TEXLIVE_INSTALL_NO_WELCOME
+echo i | time nice -19 perl install-tl # do full install to default location.
+  # takes about 30min
 rm /usr/local/texlive-rel; ln -s texlive/$this /usr/local/texlive-rel
+ls !$
 newsrc=!$/source
 mkdir $newsrc
+chgrp texlive !$; chmod g+ws !$
 cp -v source/{install-tl,texlive,w32tex}*.tar.?z $newsrc
 ls -l !$
 mount /home/ftp/texlive/Contents/live
@@ -412,7 +414,7 @@ umount /mnt/tl
 
 update ~www/texlive web pages (search for $prev and $prev-1):
   acquire* - general
-  bugs.html - general, also case of $prevprev at bottom
+  bugs.html - news from pretest.html, also case of $prevprev at bottom
   build.html - platform list
   custom-bin.html - remove any old, add any new
   doc.html - platform list, translation list
@@ -421,38 +423,40 @@ 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, and update existing:
+check for new Texinfo manuals to link to html versions, and if any,
+make a new link in:
   ~www/texinfohtml/
-further web updates below.
 
-update historic/systems with final proTeXt, when ready.
+- update historic/systems with final proTeXt, when ready.
   https://bscw.fernuni-hagen.de
   ftp://ftp.fernuni-hagen.de/pub/windows/win32/ProTeXt/
   ~www/protext/index.html
 
 - announcements:
 CTAN @ ISO update: remove old version, re-enable tlnet mirroring, MacTeX.
-Dick @ updating MacTeX.
+Dick @ updating MacTeX web pages.
 Siep @ windows.html, Norbert @ debian,updmap-kanji.html.
 pdftex maintainers @ updating pdftex sources with sync-pdftex.sh + tag.
-(no longer) Nikola @ FreeBSD notes linked on bugs.html.
-tex-live @ release made.
+tex-live, tldistro @ release made.
 
 - make tag + branch:
 Before: Determine revision number from svn log
- or https://tug.org/pipermail/tex-live-commits/ 
+ or https://tug.org/pipermail/tex-live-commits/
  in case commits were mistakenly made.
 Also: look at https://tug.org/svn/texlive/tags/ to get subnum
  and https://tug.org/svn/texlive/branches/ to avoid duplication.
-rev=54631
-subnum=0 # increase as necessary if multiple branches needed
+rev=58693
+subnum=1 # increase as necessary if multiple branches needed
 tlyear=`date +%Y`; echo $tlyear # maybe previous year during pretest, as above
 svn copy -r $rev \
  -m"texlive-$tlyear.$subnum tag based on r$rev" \
- svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-$tlyear.$subnum
+ svn://tug.org/texlive/trunk \
+ svn://tug.org/texlive/tags/texlive-$tlyear.$subnum
+#
 svn copy -r $rev \
   -m"branch$tlyear branch based on r$rev" \
-  svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/branch$tlyear
+  svn://tug.org/texlive/trunk \
+  svn://tug.org/texlive/branches/branch$tlyear[.$subnum]
   # add .$subnum to branch name (and in comment) if not making the first.
 
   It's the same command, just different destinations.
@@ -485,11 +489,11 @@ By the way, in the event of a mistaken delete, the material is best
 recovered with, where 57911 is the good revision to restore from:
   svn merge -r HEAD:57911 .
 so as to keep the version history, which retrieving the files and
-re-adding would not do.
+re-adding would not do. (But renamed files are not handled, it seems.)
 
-- update ~karl/bin/cron.tl, and reenable when feel ready:
+- update ~karl/bin/cron.tl, be sure cron.pretest and cron.branch are disabled,
+and reenable cron.trunk when feel ready:
 critical=
-pretest=
 images_frozen=true
 net_frozen=false
 all_frozen=false