summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl30
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl34
-rwxr-xr-xMaster/tlpkg/bin/tl-update-bindir2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet3
-rw-r--r--Master/tlpkg/doc/coding-style.txt3
-rw-r--r--Master/tlpkg/doc/releng.txt47
6 files changed, 96 insertions, 23 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl b/Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl
index ec08c5306b3..42db9001ec4 100644
--- a/Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl
+++ b/Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl
@@ -27,27 +27,30 @@ use File::Basename ;
$Getopt::Long::passthrough = 1 ; # no error message
$Getopt::Long::autoabbrev = 1 ; # partial switch accepted
-my $Help = 0;
-my $Latex = 0;
-my $RawMP = 1;
+my $Help = 0 ;
+my $Latex = 0 ;
+my $TeXexec = 0 ;
+my $RawMP = 1 ;
my $MetaFun = 0 ;
-my $PassOn = '' ;
+my $PassOn = '' ;
&GetOptions
( "help" => \$Help ,
"rawmp" => \$RawMP, # option is now default, but keep for compat
"metafun" => \$MetaFun,
"passon" => \$PassOn, # option is ignored, but keep for compat
- "latex" => \$Latex ) ;
-
-my $program = "MPtoPDF 1.4.0" ;
-my $pattern = "@ARGV" ; # was $ARGV[0]
-my $miktex = 0 ;
-my $done = 0 ;
-my $report = '' ;
+ "latex" => \$Latex,
+ "texexec" => \$TeXexec) ;
+
+my $program = "MPtoPDF 1.4.1" ;
+my $pattern = "@ARGV" ; # was $ARGV[0]
+my $miktex = 0 ;
+my $done = 0 ;
+my $report = '' ;
my $mplatexswitch = " --tex=latex " ;
+my $texexecswitch = " --tex=\"texexec --batch --once --nomp --mptex\" " ; # untested
-my $dosish = ($Config{'osname'} =~/^(ms)?dos|^os\/2|^mswin/i) ;
+my $dosish = ($Config{'osname'} =~ /^(ms)?dos|^os\/2|^mswin/i) ;
my $escapeshell = (($ENV{'SHELL'}) && ($ENV{'SHELL'} =~ m/sh/i ));
if ($ENV{"TEXSYSTEM"}) {
@@ -88,6 +91,9 @@ if (($pattern eq '')||($Help)) {
if ($Latex) {
$rest .= " $mplatexswitch" ;
}
+ if ($TeXexec) {
+ $rest .= " $texexecswitch" ;
+ }
if ($MetaFun) {
$mpbin = "mpost --progname=mpost --mem=metafun" ;
} else {
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 8d8553aa83a..5f9c9785392 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 22448 2011-05-12 23:59:31Z karl $
+# $Id: tlmgr.pl 22804 2011-06-05 23:21:10Z karl $
#
# Copyright 2008, 2009, 2010, 2011 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 22448 $';
-my $datrev = '$Date: 2011-05-13 01:59:31 +0200 (Fri, 13 May 2011) $';
+my $svnrev = '$Revision: 22804 $';
+my $datrev = '$Date: 2011-06-06 01:21:10 +0200 (Mon, 06 Jun 2011) $';
my $tlmgrrevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$tlmgrrevision = $1;
@@ -574,6 +574,9 @@ sub handle_execute_actions
if ($::files_changed) {
$errors += do_cmd_and_check("mktexlsr");
+ if (defined($localtlpdb->get_package('context'))) {
+ $errors += do_cmd_and_check("mtxrun --generate");
+ }
$::files_changed = 0;
}
@@ -3938,11 +3941,26 @@ sub check_runfiles {
# assume tex4ht, xdy, afm stuff is ok, and don't worry about
# Changes, README et al. Other per-format versions.
next if $f =~ /\.(afm|cfg|4hf|htf|xdy)$/;
- next if $f =~ /^(Changes|README|language\.dat|(czech|slovak)\.sty)$/;
- next if $f =~ /^(libertine\.sty|m-tex4ht\.tex|metatex\.tex)$/;
- next if $f =~ /^(kinsoku\.tex|luatools\.lua|cid2code\.txt|etex\.src)$/;
- next if $f =~ /^(ps2mfbas\.mf|pstricks\.con|tex4ht\.env)$/;
- next if $f =~ /^(texutil\.rb|tlmgrgui\.pl|language\.def)$/;
+ next if $f
+ =~ /^((czech|slovak)\.sty
+ |Changes
+ |README
+ |cid2code\.txt
+ |etex\.src
+ |kinsoku\.tex
+ |language\.dat
+ |language\.def
+ |libertine\.sty
+ |luatools\.lua
+ |m-tex4ht\.tex
+ |metatex\.tex
+ |ps2mfbas\.mf
+ |pstricks\.con
+ |sample\.bib
+ |tex4ht\.env
+ |texutil\.rb
+ |tlmgrgui\.pl
+ )$/x;
#
my @copies = grep (/\/$f$/, @runtime_files);
# map files can be duplicated between (but not within) formats.
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.