tl18 pretest initial setup

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

7 files changed, 43 insertions, 24 deletions

diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index c8873ede054..f5efd41178c 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -52,7 +52,7 @@ BEGIN {
 
 # the year of our release, will be used in the location of the
 # network packages, and in menu names, and other places.
-$ReleaseYear = 2017;
+$ReleaseYear = 2018;
 
 # users can upgrade from this year to the current year; might be the
 # same as the release year, or any number of releases earlier.
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 061c384f768..cf72d798fd8 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -184,7 +184,9 @@ for tlplat in $tlplats; do
     $grab http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz;;
    x86_64-linux)
     # local: default_bin_loc=/home/texlive/karl/Build/source/inst/bin/x86_64-pc-linux-gnu;;
-    ;; # updated by Norbert.
+    default_bin_loc=$download_loc
+    $grab http://www.preining.info/x86_64-linux-svn46780.tar.gz
+    ;;
    x86_64-solaris)
     default_bin_loc=$download_loc
     $grab http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz;;
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 160c0cc19f7..4727b108cb3 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2008-2017 Norbert Preining
+# Copyright 2008-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
@@ -9,7 +9,7 @@ vc_id='$Id$'
 unset CDPATH
 unset LS_COLORS
 
-yyyy=2017
+yyyy=2018
 
 check_consistency=true
 chicken=false
@@ -133,7 +133,7 @@ tlpdbopt_install_srcfiles 1
 tlpdbopt_create_formats 1
 instopt_letter 0
 instopt_adjustpath 0
-instopt_adjustrepo 1
+instopt_adjustrepo 0
 " >texlive.profile
 
 # silence envvar warnings and the welcome message.
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 087028a8969..36315796367 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -56,36 +56,35 @@ To stop updating of certain packages before the general freeze:
  II. Building pretest instead of regular release.
 
 0. On the day of the last tlnet update,
- Set frozen/1 in TLConfig.pm.
+ Set frozen=>1 in TLConfig.pm.
  Freeze should happen at that night's rebuild.
 
 1. Then, the next day, start building tlpretest:
-  Reset frozen to 0 in TLConfig.pm.`;
+  Reset frozen=>0 in TLConfig.pm.
 
-1a. And preserve final tlnet of current release:
+1a. Then preserve final tlnet of current release YYYY:
 cd /home/ftp/texlive/tlnet
 cp -ar ../tlnet /home/ftp/historic/systems/texlive/YYYY/tlnet-final
 
 1b. Set up tlpretest:
 Update /home/ftp/texlive/tlpretest/README.
-Empty tlpretest otherwise and then touch texlive.tlpdb;
-then --recreate in cron.tl should suffice.
+Empty tlpretest except for that README and 00_TIME.txt (used for mirmon).
 
-2. Then switch to pretest in cron.tl:
+2. Prepare for pretest in cron.tl:
 critical=--critical	 # push tlcritical
 pretest=--pretest	 # update tlpretest, not tlnet (if not frozen)
 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.)
-First build happens below.
+First build happens below, after many more changes; don't start it yet.
 
-3. option adjustrepo 0 in tl-update-tlnet, since pretest shouldn't go
+3. option adjustrepo 0 in tl-update-tlnet, since pretest users shouldn't go
 to CTAN for updates.
 
 4. After setting up for pretest (not before), basic updates for release year:
 Master/.mkisofsrc
 Master/release-texlive.txt
-Master/tlpkg/TeXLive/TLConfig.pm (including MinRelease)
+Master/tlpkg/TeXLive/TLConfig.pm -- $ReleaseYear and think about $MinRelease
 Master/tlpkg/bin/tl-update-tlnet
 Master/tlpkg/bin/tl-update-images
 Master/tlpkg/installer/texlive.png (tlpkg/doc/texlive-installer-graphic.xcf)
@@ -93,31 +92,42 @@ 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 commit new binaries with tl-update-bindir.
+Then install new binaries with tl-update-bindir.
+Add new executables to appropriate .tlpsrc files (likewise removals).
+Add new scripts to linked_scripts if not already handled.
 
-6. After committing, run tex \\end to check that mktexfmt works. 
+6. Run tex \\end to check that mktexfmt works. 
 Also run fmtutil --all to check that all formats build, no config file
-problems.  Then, so things will get redone later as another check:
+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):
   diff -ru0 --exclude=man --exclude=info \
     Build/source/inst/texmf-dist Master/texmf-dist
-for p in *conv hbf2gf; do cp /home/ftp/tex-archive/language/chinese/CJK/cjk-4.8.4/doc/pdf/$p.pdf $p; done
 
-8. Now, try a first update of tlpretest:
+7a. If new cjk release:
+cd Master/texmf-dist/doc
+for p in *conv hbf2gf; do cp /home/ftp/tex-archive/language/chinese/CJK/cjk-X.Y.Z/doc/pdf/$p.pdf $p; done
+
+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.
 
-9. After that trial build, set
+8a. svn commit all the above.
+
+9. After that trial build looks ok, set in cron.tl:
 recreate=--recreate  # just once! to get catalogue updates, and again:
-  mkdir /home/ftp/texlive/tlpretest/tlpkg
-  touch !$/texlive.tlpdb
-  force_rebuild=true cron.tl
+   And do:
+mkdir /home/ftp/texlive/tlpretest/tlpkg
+touch !$/texlive.tlpdb
+force_rebuild=true cron.tl
+
+10. After first rebuild success, undo --recreate and proceed normally.
 
-A. After tlnet freeze:
+A. At some point, after tlnet freeze:
   Run tl-update-linked-scripts for consistency.
   In Master/tlpkg, update bundled Windows programs as needed:
     dviout texworks tlgs tlperl tlpsv
diff --git a/Master/tlpkg/tlpsrc/autosp.tlpsrc b/Master/tlpkg/tlpsrc/autosp.tlpsrc
index dca338c719c..a37430cb26d 100644
--- a/Master/tlpkg/tlpsrc/autosp.tlpsrc
+++ b/Master/tlpkg/tlpsrc/autosp.tlpsrc
@@ -1 +1,2 @@
 binpattern f bin/${ARCH}/${PKGNAME}
+binpattern f bin/${ARCH}/tex2aspc
diff --git a/Master/tlpkg/tlpsrc/axodraw2.tlpsrc b/Master/tlpkg/tlpsrc/axodraw2.tlpsrc
index e69de29bb2d..b5a74907444 100644
--- a/Master/tlpkg/tlpsrc/axodraw2.tlpsrc
+++ b/Master/tlpkg/tlpsrc/axodraw2.tlpsrc
@@ -0,0 +1 @@
+binpattern f bin/${ARCH}/axohelp
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index 71fc396881a..d28a45a7867 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -30,6 +30,11 @@ binpattern f bin/${ARCH}/luatex
 binpattern f bin/${ARCH}/texlua
 binpattern f bin/${ARCH}/texluac
 #
+# temp for tl2017, to make binaries available for manual installation.
+binpattern f bin/${ARCH}/luatex53
+binpattern f bin/${ARCH}/texlua53
+binpattern f bin/${ARCH}/texlua53c
+#
 binpattern f/i386-cygwin bin/i386-cygwin/cygtexlua*.dll
 binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygtexlua*.dll
 #