diff options
| -rw-r--r-- | Build/source/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/README | 9 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/c2l | 3 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-bindir | 2 | ||||
| -rw-r--r-- | Master/tlpkg/doc/releng.txt | 54 |
5 files changed, 59 insertions, 13 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index 38df40c14c2..0e93d0d0119 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2020-03-06 Karl Berry <karl@tug.org> + + * .travis.yml: attempt to reenable musl build on github. + 2020-01-31 Karl Berry <karl@tug.org> * Makefile.am (texlinks_dir): now texk/texlive/tl_support diff --git a/Build/source/README b/Build/source/README index 6efe9fdac22..c5f57047e37 100644 --- a/Build/source/README +++ b/Build/source/README @@ -39,11 +39,16 @@ i386-netbsd, amd64-netbsd: CFLAGS=-D_NETBSD_SOURCE \ CXXFLAGS='-D_NETBSD_SOURCE -std=c++11' \ LDFLAGS='-L/usr/X11R7/lib -Wl,-rpath,/usr/X11R7/lib' \ - ./Build --enable-xindy CLISP=/usr/local/bin/clisp --disable-dvisvgm + ./Build --enable-xindy CLISP=/usr/local/bin/clisp + Except that we take Nelson's asy build. i386-freebsd, amd64-freebsd: http://anthesphoria.net/FreeBSD/TeXLive-2018/ has details for 2018. - 2019 built on contextgarden, see below. + 2019 and forward built on contextgarden (see below). + In 2020: FreeBSD 12.1-RELEASE-p1 + (e.g., +https://build.contextgarden.net/#/builders/56/builds/141/steps/2/logs/build _info + ) Except that we take Nelson's asy build. i386-linux: see travis below. diff --git a/Master/tlpkg/bin/c2l b/Master/tlpkg/bin/c2l index a01abc2e3f5..c29c695bbb3 100755 --- a/Master/tlpkg/bin/c2l +++ b/Master/tlpkg/bin/c2l @@ -56,7 +56,7 @@ sub main { $arg = "x86_64-linuxmusl"; } elsif ($arg eq "norbert" || $arg eq "nor") { - for my $p (qw(i386-linux x86_64-linux)) { + for my $p (qw(i386-linux x86_64-linux x86_64-linuxmusl)) { system ("$0 $p") && die "norbert/$p failed"; } print "$0: norbert updates done.\n"; @@ -65,7 +65,6 @@ sub main { } 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 3cf828f97d6..e257ae4d9ce 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -217,7 +217,7 @@ for tlplat in $tlplats; do 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 + #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 ae1f7262196..4c75377be80 100644 --- a/Master/tlpkg/doc/releng.txt +++ b/Master/tlpkg/doc/releng.txt @@ -181,6 +181,37 @@ C. Build a test ISO image for initial TeX Collection testing: Can disable image building again after the initial build for a while. +L. It may be that we need to update the "frozen" release while the + pretest is going on. To do that, the idea is to make a tag+branch for + the last update before switching to the pretest, check that out, + and use it for such critical updates. To do that, + a) look at https://tug.org/svn/texlive/tags/ to choose the right + tag name. For TL19 (during the TL20 pretest), it was texlive-2019.4, + since .0-3 were used during the release. + b) look at https://tug.org/pipermail/tex-live-commits/ to determine + the right revision number: probably the "autoupdate" during the + last build before the pretest setup. For TL19, that was 53984. + c) run the svn commands given below to create the tag and branch. + d) make working checkout of the new branch (at this point we should + be fine to wipe out the old branch checkout, if there was one). +mkdir /home/texlive/branch +cd !$ +tlyear=2019 +subnum=4 +nice -19 svn co svn://tug.org/texlive/branches/branch$tlyear.$subnum . >&out +# the redirect is because there's a lot of output. If there are no +# errors, just rm out afterwards. + + e) make the required update, probably most easily by copying the + affected files from the trunk. Running ctan2tl (c2l) inside the + branch checkout should also work, if no other changes have intervened. + + e) Update the tlnet-final directory in historic: +tlnet_live=/home/ftp/texlive/tlnet +tlnet_historic=/home/ftp/historic/systems/texlive/2019/tlnet-final +rsync -av -n $tlnet_live/ $tlnet_historic/ # trailing /'s needed +# remove the -n after checking that only expected files are updated. + M. As work proceeds, update the doc: MetaPost (in texmf-dist), other engine (in source) NEWS. Ensure all engine manuals updated in texmf-dist. @@ -356,15 +387,21 @@ pdftex maintainers @ updating pdftex sources with sync-pdftex.sh + tag. tex-live @ release made. - make tag + branch: -(determine revision number from svn log, in case commits were mistakenly made) -rev=50896 # svnversion -this=`date +%Y`; echo $this +Before: Determine revision number from svn log + 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=53984 +subnum=0 # increase as necessary if multiple branches needed +tlyear=`date +%Y`; echo $this # might be previous year during pretest, as above svn copy -r $rev \ - -m"texlive-$this.0 tag based on r$rev" \ - svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-$this.0 + -m"texlive-$tlyear.$subnum tag based on r$rev" \ + svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-$tlyear.$subnum svn copy -r $rev \ - -m"branch$this branch based on r$rev" \ - svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/branch$this + -m"branch$tlyear branch based on r$rev" \ + svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/branch$tlyear + # add .$subnum to branch name (and in comment) if making It's the same command, just different destinations. http://svnbook.red-bean.com/en/1.8/svn.branchmerge.html @@ -374,6 +411,7 @@ svn copy -r $rev \ To check out the branch, for critical source fixes for the sake of during-the-year rebuilds or for the distros, if they request it: +this=`date +%Y`; echo $this # whatever year is appropriate cd /home/texlive rm -rf branch # when starting a new year on tug mkdir branch @@ -384,7 +422,7 @@ svn co svn://tug.org/texlive/branches/branch$this/Build/source . >&out Do a test build, commit when successful. Ask for rebuilds, When (enough) rebuilds are done, commit to the branch and make another tag: - bcr=nnnnn # branch_commit_revision, e.g., 51236 + bcr=nnnnn # branch commit revision, e.g., 51236 bt=n # branch tag, e.g., 2019.3 #svn copy -r $bcr -m'texlive-$bt tag based on r$bcr, with <whatever> fix' \ # svn://tug.org/texlive/branches/branch2019 \ |