From b64c7b32b48777f57e9897efc88b21744968a615 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Apr 2014 23:05:35 +0000 Subject: more settings for 2014 preparations git-svn-id: svn://tug.org/texlive/trunk@33493 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLPDB.pm | 2 +- Master/tlpkg/bin/tl-update-bindir | 18 ++++++++++-------- Master/tlpkg/bin/tl-update-tlnet | 2 +- Master/tlpkg/doc/releng.txt | 18 ++++++++++++------ 4 files changed, 24 insertions(+), 16 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index abcbd51e599..a5bbbbeef60 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -760,7 +760,7 @@ sub expand_dependencies { # before we ignored all deps of schemes and colls if -no-collections # was given, but this prohibited auto-install of new collections # even if the scheme is updated. - # Now we supress only "same-level dependencies", so scheme -> scheme + # Now we suppress only "same-level dependencies", so scheme -> scheme # and collections -> collections and package -> package # hoping that this works out better # if ($tlpdd->category =~ m/$MetaCategoriesRegexp/) { diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index 476426e02a7..928845d9e3a 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -173,18 +173,20 @@ for tlname in $tlnames; do sparc-solaris) default_bin_loc=/home/karl/ss.tgz;; universal-darwin) - download_loc=$tmpdir/tl.$tlname.tar.xz - default_bin_loc=$download_loc - grab="$download -O $download_loc" - $grab http://pages.uoregon.edu/koch/universal-darwin.tar.xz;; + #download_loc=$tmpdir/tl.$tlname.tar.xz + #default_bin_loc=$download_loc + #grab="$download -O $download_loc" + #$grab http://pages.uoregon.edu/koch/universal-darwin.tar.xz;; + default_bin_loc=/home/koch/universal-darwin.tar.xz;; win32) default_bin_loc=$tmpdir/tl.$tlname.zip $grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;; x86_64-darwin) - download_loc=$tmpdir/tl.$tlname.tar.xz - default_bin_loc=$download_loc - grab="$download -O $download_loc" - $grab http://pages.uoregon.edu/koch/x86_64-darwin.tar.xz;; + #download_loc=$tmpdir/tl.$tlname.tar.xz + #default_bin_loc=$download_loc + #grab="$download -O $download_loc" + #$grab http://pages.uoregon.edu/koch/x86_64-darwin.tar.xz;; + default_bin_loc=/home/koch/x86_64-darwin.tar.xz;; x86_64-linux) default_bin_loc=$download_loc $grab ftp://ftpth.mppmu.mpg.de/pub/peb/TLtests/Build-x86_64-linux.tar.bz2;; diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 91c80e7a485..44c377b58d3 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -115,7 +115,7 @@ option_fmt 1 option_letter 0 option_src 1 option_path 0 -option_adjustrepo 1 +option_adjustrepo 0 " >texlive.profile # silence warnings we do not need to see. diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt index cdc142e9839..0412a4e50e7 100644 --- a/Master/tlpkg/doc/releng.txt +++ b/Master/tlpkg/doc/releng.txt @@ -34,12 +34,16 @@ Update /home/ftp/texlive/tlpretest/README. cp -ar ../tlnet /home/ftp/historic/systems/texlive/YYYY/tlnet-final 2. Then switch to 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) +critical=--critical # push tlcritical +pretest=--pretest # update tlpretest, not tlnet (if not frozen) +recreate=--recreate # just once! (to get catalogue updates) +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.) +2a. option adjustrepo 0 in tl-update-tlnet, since pretest shouldn't go +to CTAN for updates. + 3. The next nightly build will update tlpretest, or run force_rebuild=true cron.tl (but good to do the next steps first). @@ -56,7 +60,8 @@ Master/texmf-dist/web2c/texmf.cnf # from Build/.../kpathsea 5. After committing, see if formats build, to check for config file problems. Then rm -rf ~/.texlive`date +%Y` # the new one Consider new xz and wget binaries. -Then commit new binaries and rebuild tlpretest as above. +Then commit new binaries (see version checks below). +Rebuild tlpretest as above. N. Later, when closer to release: - in cron.tl, set images_frozen=false. @@ -76,7 +81,8 @@ When finalizing sources (best before tlnet freeze for pretest) dvips: configure.ac ChangeLog NEWS dvips.c dvips.h afm2tfm.c dvips.texi kpathsea: version.ac ChangeLog NEWS kpsewhich.c doc/kpathsea.texi texmf.cnf ptexenc: version.ac ChangeLog - web2c: NEWS doc/web2c.texi luatexdir/lua/luainit.w + web2c: NEWS doc/web2c.texi ptexdir/ptex-base.ch,ptex_version.h + then reautoconf (6min), rebuild. install-tl, tlmgr.pl (copyright only) run ~karl/bin/tlversions to see+compare engine/etc. versions @@ -110,7 +116,7 @@ After final build, to do total freeze: Making the big release: -- Live unmount of last year's: +- unmount live install of last year's: umount /home/ftp/texlive/Contents/live hx=/home/ftp/historic/systems/texlive -- cgit v1.2.3