summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-30 18:16:10 +0000
committerKarl Berry <karl@freefriends.org>2016-06-30 18:16:10 +0000
commit388beecbb45b370adf62c66b34ad2b60e764e1a2 (patch)
tree215559e676a75b5a8275a79c75d13c5cae4fc7a8 /Master/tlpkg
parentf49dd37a814dff02b0392e062a34fdf846653396 (diff)
(u)ptex: minimize dependencies to just the engine; check-fmttriggers: new option --fmtargs
git-svn-id: svn://tug.org/texlive/trunk@41579 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/check-fmttriggers26
-rw-r--r--Master/tlpkg/tlpsrc/ptex.tlpsrc10
-rw-r--r--Master/tlpkg/tlpsrc/uptex.tlpsrc8
3 files changed, 18 insertions, 26 deletions
diff --git a/Master/tlpkg/bin/check-fmttriggers b/Master/tlpkg/bin/check-fmttriggers
index a696789d07d..ba1447c9f91 100755
--- a/Master/tlpkg/bin/check-fmttriggers
+++ b/Master/tlpkg/bin/check-fmttriggers
@@ -8,10 +8,10 @@
# then check that exactly those packages are listed as triggers in the
# corresponding tlpsrc files.
-my ($vc_id, $Master);
+my $vc_id = '$Id$';
+my $Master;
BEGIN {
- $vc_id = '$Id$';
$^W = 1;
(my $mydir = $0) =~ s,/[^/]*$,,;
my $tlroot = "$mydir/../..";
@@ -28,6 +28,7 @@ use TeXLive::TLUtils qw(info debug ddebug debug_hash tlwarn tldie);
my $prg = TeXLive::TLUtils::basename($0);
+my $opt_fmtargs = "--all";
my $opt_fmtdir = "/tmp/fmttriggers";
my $opt_rerecord = 1;
my $opt_help = 0;
@@ -35,6 +36,7 @@ my $opt_version = 0;
TeXLive::TLUtils::process_logging_options ();
GetOptions (
+ "fmtargs=s" => \$opt_fmtargs,
"fmtdir" => \$opt_fmtdir,
"rerecord!" => \$opt_rerecord,
"version" => \$opt_version,
@@ -90,10 +92,8 @@ sub run_fmtutil {
# the output from fmtutil can be useful in debugging.
my $logfile = "$outdir/fmtutil.log";
- my $which = "--all";
- #$which = "--byengine=tex";
- my $cmd = "fmtutil --sys --recorder --strict --fmtdir=$outdir $which "
- . ">$logfile 2>&1";
+ my $cmd = "fmtutil --sys --recorder --strict --fmtdir=$outdir "
+ . "$opt_fmtargs >$logfile 2>&1";
&info ("Running $cmd\n");
my $retval = system ($cmd);
$retval >>= 8 if $retval > 0;
@@ -343,16 +343,22 @@ __END__
=head1 NAME
-check-fmt-triggers - check that all needed packages trigger format rebuilds
+check-fmttriggers - check that all needed packages trigger format rebuilds
=head1 SYNOPSIS
-check-fmt-trigger [I<option>]...
+check-fmttriggers [I<option>]...
=head1 OPTIONS
=over 4
+=item B<--fmtargs> I<str>
+
+Pass I<str> to C<fmtutil>, overriding C<--all>; e.g., for debugging you
+might want C<--fmtargs=--byfmt=tex> to build only C<tex.fmt>. (Many
+inconsistencies with the TLPDB will be reported, naturally.)
+
=item B<--fmtdir> I<dir>
Rebuild formats in I<dir>; default C</tmp/fmttriggers>. This directory
@@ -376,7 +382,9 @@ Display version information and exit.
The standard options B<-q>, B<-v>, and B<-logfile>=I<file> are also
accepted; see the C<process_logging_options> function in
-L<TeXLive::TLUtils> for details.
+L<TeXLive::TLUtils> for details. In particular, with B<-v> or higher,
+the packages found to be needed for each I<engine.format> combination
+will be reported.
=head1 DESCRIPTION
diff --git a/Master/tlpkg/tlpsrc/ptex.tlpsrc b/Master/tlpkg/tlpsrc/ptex.tlpsrc
index 41a930ef30a..4f08b46bc6c 100644
--- a/Master/tlpkg/tlpsrc/ptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ptex.tlpsrc
@@ -1,11 +1,3 @@
-depend tex
-depend latex
-depend hyph-utf8
-depend adobemapping
-depend ipaex
-depend japanese
-depend japanese-otf
-depend pbibtex-base
depend ptex-base
depend ptex-fonts
@@ -37,7 +29,7 @@ runpattern +!d texmf-dist/tex/generic/hyph-utf8/patterns/ptex
docpattern +f texmf-dist/doc/man/man1/mendex.*
-# pbibtex-base excludes:
+# pbibtex excludes:
docpattern +!d texmf-dist/doc/ptex/pbibtex
# ptex-base excludes:
diff --git a/Master/tlpkg/tlpsrc/uptex.tlpsrc b/Master/tlpkg/tlpsrc/uptex.tlpsrc
index 52642c5b4c0..021176805ed 100644
--- a/Master/tlpkg/tlpsrc/uptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uptex.tlpsrc
@@ -1,11 +1,3 @@
-depend adobemapping
-depend convbkmk
-depend hyph-utf8
-depend ipaex
-depend japanese
-depend japanese-otf
-depend latex
-depend ptex
depend uptex-base
depend uptex-fonts