summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-17 23:05:35 +0000
committerKarl Berry <karl@freefriends.org>2014-04-17 23:05:35 +0000
commitb64c7b32b48777f57e9897efc88b21744968a615 (patch)
tree33d12467a34c515916bac6e8a191253e9e4054cf
parent2863521d6b9fb1d966044e8b9254a2b68f0d576e (diff)
more settings for 2014 preparations
git-svn-id: svn://tug.org/texlive/trunk@33493 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl9
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-bindir18
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet2
-rw-r--r--Master/tlpkg/doc/releng.txt18
5 files changed, 27 insertions, 22 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 05aae88be3f..1ec60e73515 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5041,7 +5041,8 @@ sub check_depends {
}
# list of collections.
my @colls = $localtlpdb->collections;
- my @coll_deps = $localtlpdb->expand_dependencies("-no-collections",$localtlpdb,@colls);
+ my @coll_deps
+ = $localtlpdb->expand_dependencies("-no-collections", $localtlpdb, @colls);
my %coll_deps;
@coll_deps{@coll_deps} = (); # initialize hash with keys from list
@@ -5051,9 +5052,8 @@ sub check_depends {
next if $pkg =~ m/^00texlive/;
# For each package, check that it is a dependency of some collection.
- # Whatever is left in %coll_deps after this loop will be the problem
if (! exists $coll_deps{$pkg}) {
- # Except that schemes and our special .win32 packages are ok.
+ # Except that schemes and our ugly Windows packages are ok.
push (@no_dep, $pkg) unless $pkg =~/^scheme-|\.win32$/;
}
@@ -7188,9 +7188,6 @@ downgrade. Also, packages for uninstalled platforms are not installed.
=head1 USER MODE
-B<WARNING:> This is new work in TL 2013. Expect breakage, and the need
-to reinstall your user tree.
-
C<tlmgr> provides a restricted way, called ``user mode'', to manage
arbitrary texmf trees in the same way as the main installation. For
example, this allows people without write permissions on the
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