summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-06-05 23:24:35 +0000
committerKarl Berry <karl@freefriends.org>2011-06-05 23:24:35 +0000
commita80b3d22685c55777f346f41f850074682e949f6 (patch)
tree4a97e108d55c34be21ec1ef8688b4828353e1755 /Build
parent912dc1fca4adfdd4337b256729a196debbd1078a (diff)
doc/consistency
git-svn-id: svn://tug.org/texlive/trunk@22805 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl30
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl34
2 files changed, 44 insertions, 20 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.