diff options
author | Karl Berry <karl@freefriends.org> | 2011-06-05 23:24:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-06-05 23:24:35 +0000 |
commit | a80b3d22685c55777f346f41f850074682e949f6 (patch) | |
tree | 4a97e108d55c34be21ec1ef8688b4828353e1755 /Master | |
parent | 912dc1fca4adfdd4337b256729a196debbd1078a (diff) |
doc/consistency
git-svn-id: svn://tug.org/texlive/trunk@22805 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-bindir | 2 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 3 | ||||
-rw-r--r-- | Master/tlpkg/doc/coding-style.txt | 3 | ||||
-rw-r--r-- | Master/tlpkg/doc/releng.txt | 47 |
4 files changed, 52 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index ab2e70a222a..714140cc2ec 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -132,7 +132,7 @@ for tlname in $tlnames; do download_loc=$tmpdir/tl.$tlname.tar.xz default_bin_loc=$download_loc grab="$download -O $download_loc" - $grab http://salmi.ch/~jukka/TL/TL2010bin_i386-netbsd.tar.xz;; + $grab http://salmi.ch/~jukka/TL2011/TL2011bin_i386-netbsd.tar.xz;; i386-openbsd) default_bin_loc=$download_loc $grab http://students.dec.bmth.ac.uk/ebarrett/files/tl-bin-20080810.tgz;; diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 2825b9bfc87..b2bcd66ec22 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 Norbert Preining +# Copyright 2008, 2009, 2010, 2011 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # @@ -206,6 +206,7 @@ if $chicken; then echo "$0: Chicken mode, not updating anything." else echo "$0: Updating $tlweb from $tltry." + # mv then rm to avoid the mirmon probe from making the rm fail. mv $tlweb $tltrybase/tlnet.old mv $tltry $tlweb rm -rf $tltrybase diff --git a/Master/tlpkg/doc/coding-style.txt b/Master/tlpkg/doc/coding-style.txt index 087322cce66..664c5bc08a7 100644 --- a/Master/tlpkg/doc/coding-style.txt +++ b/Master/tlpkg/doc/coding-style.txt @@ -5,7 +5,7 @@ This is all trying to record our general conventions, not absolute rules. Aside from personal preferences, sometimes exceptions are necessary. -* In general it's best to start scripts #!/usr/bin/env perl. +* In general, it's best to start scripts #!/usr/bin/env perl. * Start the code with the various require and use statements, @@ -34,6 +34,7 @@ top-down rather than bottom-up. So main would come first. * Normal indentation is two spaces per level. +Put a space around operators (=, =~, +, etc.). Put a space between arguments of function calls. Karl puts a space before the ( of function calls but no one else does :). diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt new file mode 100644 index 00000000000..c2b654b1069 --- /dev/null +++ b/Master/tlpkg/doc/releng.txt @@ -0,0 +1,47 @@ +$Id$ +Public domain. + +Just rough notes on putting together the yearly release --karl. + + +/home/httpd/html/texlive/mirmon/tlpretest-mirrors.txt + +# on the day of the last tlnet update, +# set opt_frozen in 00texlive.installation.tlpsrc. +# freeze should happen the next day. + + +then, the next day, build tlpretest. + +0. Reset opt_frozen to 0 in 00texlive.installation.tlpsrc. + +1. Set up tlpretest: +cd /home/ftp/texlive/tlnet +tar cf - [a-u]* | (cd ../tlpretest && tar xf -) +# do not copy README. + +2. Then make these changes in the cron script: +--- cron.tl 2011/05/25 22:49:19 1.171 ++++ cron.tl 2011/05/25 22:50:03 +@@ -16,7 +16,7 @@ trap "rm -f $lockfile; exit 0;" 0 1 2 15 + critical= #--critical # push tlcritical to tlnet +-pretest= #--pretest # update tlpretest, not tlnet (when frozen) ++pretest=--pretest # update tlpretest, not tlnet (when frozen) + recreate= #--recreate # recreate all packages in tlnet (do not do lightly) + + all_frozen=false # master tree +-tlnet_frozen=false # tlnet/tlpretest ++tlnet_frozen=true # tlnet/tlpretest + : ${images_frozen=true} # iso generation + +3. The next nightly build will update tlpretest, or run +force_rebuild=true cron.tl + + +4. kpathsea/texmf.cnf & web2c/texmf.cnf, + Master/release-texlive.txt, + Master/tlpkg/TeXLive/TLConfig.pm - change $ReleaseYear. + + +tlcritical will remain getting updated daily, even though it doesn't +work with tlnet any more. c'est la vie. |