From 43e2e31c6c50260cce588637b892ab1b6c0ee743 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 May 2012 15:53:55 +0000 Subject: tl12 preliminaries git-svn-id: svn://tug.org/texlive/trunk@26312 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/texmf.cnf | 8 ++- Master/texmf/doc/texlive/texlive-en/texlive-en.tex | 64 +++++++++++----------- Master/texmf/web2c/texmf.cnf | 47 +++++++++++++--- Master/tlpkg/TeXLive/TLUtils.pm | 1 - Master/tlpkg/bin/check-files-by-format | 1 + Master/tlpkg/bin/tl-update-tlnet | 2 +- Master/tlpkg/dev/tlnet-disabled-packages.txt | 1 - Master/tlpkg/doc/packages.txt | 26 +++++---- Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc | 4 +- 9 files changed, 98 insertions(+), 56 deletions(-) diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index 13039058221..7838c771984 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -473,12 +473,13 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % However, we want to include one more directory: the % great-grandparent's texmf-local, because that is how TL is installed % by default. That is, given a binary -% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should be fine -% /usr/local/texlive/texmf-local/web2c/texmf.cnf. Not under YYYY. +% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find +% /usr/local/texlive/texmf-local/web2c/texmf.cnf. I.e., not under YYYY. % % As a result, we cannot use actual brace expansion in the definition, % since we don't want to scatter ../'s throughout the value. Hence we -% explicitly list every directory. Arguably more understandable anyway. +% explicitly list every directory. Arguably more understandable this +% way anyway. % TEXMFCNF = {\ $SELFAUTOLOC,\ @@ -542,6 +543,7 @@ shell_escape_commands = \ bibtex,bibtex8,\ kpsewhich,\ makeindex,\ +mpost, repstopdf,\ % we'd like to allow: diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex index 333b79c6759..69ba446bd38 100644 --- a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex +++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex @@ -13,14 +13,14 @@ \title{% {\huge \textit{The \TeX\ Live Guide}\\\smallskip}% - {\LARGE \textsf{\TL{} 2011}}% + {\LARGE \textsf{\TL{} 2012}}% } \author{Karl Berry, editor \\[3mm] \url{http://tug.org/texlive/} } -\date{June 2011} +\date{June 2012} \maketitle @@ -54,6 +54,7 @@ see the end of the document, section~\ref{sec:history} (\p.\pageref{sec:history}). +\htmlanchor{platforms} \subsection{Operating system support} \label{sec:os-support} @@ -326,8 +327,8 @@ The default layout is: \begin{description} \item[system-wide root] can span multiple \TL{} releases: \begin{ttdescription} - \item[2010] A previous release. - \item[2011] The current release. + \item[2011] A previous release. + \item[2012] The current release. \begin{ttdescription} \item [bin] ~ \begin{ttdescription} @@ -347,9 +348,9 @@ The default layout is: \item[user's home] (\texttt{\$HOME} or \texttt{\%USERPROFILE\%}) \begin{ttdescription} - \item[.texlive2010] Privately generated and configuration data - for a previous release. \item[.texlive2011] Privately generated and configuration data + for a previous release. + \item[.texlive2012] Privately generated and configuration data for the current release. \begin{ttdescription} \item [texmf-var\ \ \ ] \envname{TEXMFVAR}, \envname{TEXMFCACHE} @@ -588,7 +589,7 @@ For a complete listing of the various options: \begin{figure}[tb] \begin{boxedverbatim} -Installing TeX Live 2011 from: ... +Installing TeX Live 2012 from: ... Platform: i386-linux => 'Intel x86 with GNU/Linux' Distribution: inst (compressed) ... @@ -605,7 +606,7 @@ Distribution: inst (compressed) directories: TEXDIR (the main TeX directory): - /usr/local/texlive/2011 + /usr/local/texlive/2012 ... options: @@ -786,8 +787,8 @@ at the package level. The default layout is described in section~\ref{sec:texmftrees}, \p.\pageref{sec:texmftrees}. The default location of -\dirname{TEXDIR} is \dirname{/usr/local/texlive/2011} on Unix -and |%SystemDrive%\texlive\2011| on Windows. +\dirname{TEXDIR} is \dirname{/usr/local/texlive/2012} on Unix +and |%SystemDrive%\texlive\2012| on Windows. The main reason to change this default is if you lack write permission for the default location. You don't have to be root or administrator to @@ -795,7 +796,7 @@ install \TL, but you do need write access to the target directory. A reasonable alternative choice is a directory under your home directory, especially if you will be the sole user. Use -`|~|' to indicate this, as in `|~/texlive/2011|'. +`|~|' to indicate this, as in `|~/texlive/2012|'. We recommend including the year in the name, to enable keeping different releases of \TL{} side by side. (You may wish to make a @@ -1006,18 +1007,18 @@ might be \filename{$HOME/.profile} (or another file sourced by \filename{.profile}, and the lines to add would look like this: \begin{sverbatim} -PATH=/usr/local/texlive/2011/bin/i386-linux:$PATH; export PATH -MANPATH=/usr/local/texlive/2011/texmf/doc/man:$MANPATH; export MANPATH -INFOPATH=/usr/local/texlive/2011/texmf/doc/info:$INFOPATH; export INFOPATH +PATH=/usr/local/texlive/2012/bin/i386-linux:$PATH; export PATH +MANPATH=/usr/local/texlive/2012/texmf/doc/man:$MANPATH; export MANPATH +INFOPATH=/usr/local/texlive/2012/texmf/doc/info:$INFOPATH; export INFOPATH \end{sverbatim} For csh or tcsh, the file to edit is typically \filename{$HOME/.cshrc}, and the lines to add might look like: \begin{sverbatim} -setenv PATH /usr/local/texlive/2011/bin/i386-linux:$PATH -setenv MANPATH /usr/local/texlive/2011/texmf/doc/man:$MANPATH -setenv INFOPATH /usr/local/texlive/2011/texmf/doc/info:$INFOPATH +setenv PATH /usr/local/texlive/2012/bin/i386-linux:$PATH +setenv MANPATH /usr/local/texlive/2012/texmf/doc/man:$MANPATH +setenv INFOPATH /usr/local/texlive/2012/texmf/doc/info:$INFOPATH \end{sverbatim} If you already have settings somewhere in your ``dot'' files, naturally @@ -1035,8 +1036,8 @@ Our two hints are: 1)~you may want to check for a file \filename{/etc/manpath.config} and, if present, add lines such as \begin{sverbatim} -MANPATH_MAP /usr/local/texlive/2011/bin/i386-linux \ - /usr/local/texlive/2011/texmf/doc/man +MANPATH_MAP /usr/local/texlive/2012/bin/i386-linux \ + /usr/local/texlive/2012/texmf/doc/man \end{sverbatim} And 2)~check for a file \filename{/etc/environment} which may define the @@ -1511,7 +1512,7 @@ include: > \Ucom{tlmgr -gui} \end{alltt} or in Windows via the Start menu: \texttt{Start}, \texttt{Programs}, -\texttt{TeX Live 2011}, \texttt{TeX Live Manager}. After clicking `Load' +\texttt{TeX Live 2012}, \texttt{TeX Live Manager}. After clicking `Load' it displays a list of available and installed packages. This assumes of course that the installation source is valid and reachable. @@ -1552,12 +1553,12 @@ running post install action for xetex install: xetex-def ... running mktexlsr -mktexlsr: Updating /usr/local/texlive/2011/texmf/ls-R... +mktexlsr: Updating /usr/local/texlive/2012/texmf/ls-R... ... running fmtutil-sys --missing ... Transcript written on xelatex.log. -fmtutil: /usr/local/texlive/2011/texmf-var/web2c/xetex/xelatex.fmt installed. +fmtutil: /usr/local/texlive/2012/texmf-var/web2c/xetex/xelatex.fmt installed. \end{fverbatim} As you can see, \prog{tlmgr} installs dependencies, and takes care of any @@ -1919,9 +1920,9 @@ for these files is named \envname{TEXMFCNF}, but we do not recommend setting this (or any) environment variable. Instead, normal installation results in a file -\file{.../2011/texmf.cnf}. If you must make changes to the defaults +\file{.../2012/texmf.cnf}. If you must make changes to the defaults (not normally necessary), this is the place to put them. The main -configuration file is in \file{.../2011/texmf/web2c/texmf.cnf}. You +configuration file is in \file{.../2012/texmf/web2c/texmf.cnf}. You should not edit this latter file, as your changes will be lost when the distributed version is updated. @@ -3273,13 +3274,7 @@ Finally, the \TL{} release on the \TK\ \DVD\ can no longer be run live beneficial side effect is that installation from the physical \DVD\ is much faster. - -% -\htmlanchor{news} -\subsection{Present} -\label{sec:tlcurrent} - -2011 saw relatively few changes. +\subsubsection{2011} The \MacOSX\ binaries (\code{universal-darwin} and \code{x86\_64-darwin}) now work only on Leopard or later; Panther and @@ -3300,6 +3295,13 @@ Windows, has been revamped and is now used on all platforms. There shouldn't be any user-visible changes as a result, except that it runs much faster. +% +\htmlanchor{news} +\subsection{Present} +\label{sec:tlcurrent} + + + \subsection{Future} \emph{\TL{} is not perfect!} (And never will be.) We intend to diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf index 078ac6112b0..7838c771984 100644 --- a/Master/texmf/web2c/texmf.cnf +++ b/Master/texmf/web2c/texmf.cnf @@ -4,8 +4,8 @@ % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an % entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2011/texmf.cnf. +% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2012/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -49,6 +49,8 @@ % (http://tug.org/tds), or files may not be found. % % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. +% Kpathsea sets SELFAUTOLOC (the directory with the binary), +% SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTOPARENT % The tree containing runtime files related to the specific @@ -74,10 +76,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config TEXMFHOME = ~/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. -TEXMFVAR = ~/.texlive2011/texmf-var +TEXMFVAR = ~/.texlive2012/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. -TEXMFCONFIG = ~/.texlive2011/texmf-config +TEXMFCONFIG = ~/.texlive2012/texmf-config % List all the texmf trees. % @@ -461,9 +463,39 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file % will take precedence over the distributed one under texmf/web2c. % -% For security reasons, it is better not to include . in this path. +% For security reasons, it is best not to include . in this path. % -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} +% The idea behind this lengthy definition: for each of +% SELFAUTO{LOC,DIR,AUTO}, look in the directory, +% then the subdirectories share/texmf-local and share/texmf, +% then ./texmf-local and ./texmf. +% +% However, we want to include one more directory: the +% great-grandparent's texmf-local, because that is how TL is installed +% by default. That is, given a binary +% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find +% /usr/local/texlive/texmf-local/web2c/texmf.cnf. I.e., not under YYYY. +% +% As a result, we cannot use actual brace expansion in the definition, +% since we don't want to scatter ../'s throughout the value. Hence we +% explicitly list every directory. Arguably more understandable this +% way anyway. +% +TEXMFCNF = {\ +$SELFAUTOLOC,\ +$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ +$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ +$SELFAUTODIR,\ +$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ +$SELFAUTOPARENT/../texmf-local/web2c,\ +$SELFAUTOPARENT,\ +$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ +$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +} +% +% For reference, here is the old brace-using definition: +%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} % kpathsea 3.5.3 and later sets these at runtime. To avoid empty % expansions from binaries linked against an earlier version of the @@ -511,6 +543,7 @@ shell_escape_commands = \ bibtex,bibtex8,\ kpsewhich,\ makeindex,\ +mpost, repstopdf,\ % we'd like to allow: @@ -718,7 +751,7 @@ screen_depth.mf = 1200 % BibTeX only (max_strings also determines hash_size and hash_prime). ent_str_size = 250 -glob_str_size = 5000 +glob_str_size = 20000 max_strings.bibtex = 35307 max_strings.bibtex8 = 35307 max_strings.bibtexu = 35307 diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 5281d668864..a385b6b2d62 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -163,7 +163,6 @@ BEGIN { &conv_to_w32_path &native_slashify &forward_slashify - &conv_to_w32_path &untar &unpack &merge_into diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format index 4f567ded087..81a75c89af2 100755 --- a/Master/tlpkg/bin/check-files-by-format +++ b/Master/tlpkg/bin/check-files-by-format @@ -102,6 +102,7 @@ my $exclude_pfb = { '*base*' => 'texmf-dist/fonts/type1', 'public/marvosym/' => 1, 'public/mathpazo/' => 1, 'public/musixtex-fonts/' => 1, # 2nov11 wrote tennent --karl + 'public/newtx/' => 1, # 12may12 author will fix in next release 'public/ocherokee/' => 1, 'public/oinuit/' => 1, 'public/omega/' => 1, diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index f04ecfd0579..c8b9d6460f1 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -1,5 +1,5 @@ #!/bin/sh -e -# Copyright 2008, 2009, 2010, 2011 Norbert Preining +# Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # diff --git a/Master/tlpkg/dev/tlnet-disabled-packages.txt b/Master/tlpkg/dev/tlnet-disabled-packages.txt index 0277905f6d4..479bc6f25b5 100644 --- a/Master/tlpkg/dev/tlnet-disabled-packages.txt +++ b/Master/tlpkg/dev/tlnet-disabled-packages.txt @@ -1,3 +1,2 @@ # this file specifies (non-critical) packages which should not be # updated on tlnet for whatever reason. It's used by tl-update-containers. -tetex diff --git a/Master/tlpkg/doc/packages.txt b/Master/tlpkg/doc/packages.txt index 6412e757022..a3efaaeb953 100644 --- a/Master/tlpkg/doc/packages.txt +++ b/Master/tlpkg/doc/packages.txt @@ -37,7 +37,7 @@ Really test during pretest (really!): .fmt's sharable across endian-different platforms (including luatex). interactive mf '\drawdot (50,50); showit;' -When finalizing sources: +When finalizing sources (can be before tlnet freeze) version numbers and years and copyright years in: top level version.ac dvips: configure.ac NEWS dvips.c dvips.h afm2tfm.c dvips.texi @@ -46,11 +46,24 @@ When finalizing sources: ptexenc: version.ac texmf.cnf (both Build and Master), texmfcnf.lua (Master) install-tl, tlmgr.pl (copyright only) - + run ~karl/bin/tlversions to see+compare engine/etc. versions + +tlnet freeze: + opt_frozen=1 in 00texlive.installation.tlpsrc on last day of updates. + on first day of freeze, pretest=--pretest and critical=--critical in cron.tl. + cp -ar tlnet /home/ftp/historic/systems/texlive/YYYY/tlnet-final + Either: + mkdir /home/ftp/texlive/tlpretest/tlpkg + cp Master/tlpkg/texlive.tlpdb !$ # no texlive.installer? + tl-update-tlnet will make everything else. + But better? + cd /home/ftp/texlive/tlnet + \cp -ar [a-u]* ../tlpretest/ # omit README (update that) + After tlnet freeze: fix release-texlive.txt, .mkisofsrc, tl-update-tlnet, TLConfig.pm (see below). - in Master: update texinfos, man pages+pdfs. + in Master: update texinfos, man pages+pdfs. make texlive.texi? update web pages, including arch list and doc translation list in doc.html. also including portable-anchor.html this year. @@ -58,13 +71,6 @@ When total freeze: peb + laurens + khaled: no commits after: copy bugs.html to historic/YYYY-1/bugs.html, rm tugstyle.css - - For tlpretest: -Make the new directory, copy in tlpkg/texlive.tlpdb but remove the -00texlive.installer stanza; tl-update-tlnet will make everything else. -But consider mv-ing the old directory so as not to actually make new -containers. Coordinate with CTAN. - Making the big release: diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc index ceb5d295b0a..58639b058b6 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc @@ -43,6 +43,6 @@ depend opt_path:0 depend opt_adjustrepo:1 depend opt_write18_restricted:1 -# if we want to make a dist frozen uncomment that and tlmgr will bail out -# telling that TLNNNN is frozen +# when we want to freeze a release, uncomment this and tlmgr will bail out +# saying that TLNNNN is frozen. depend opt_frozen:0 -- cgit v1.2.3