summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLPaper.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-06-08 14:57:10 +0000
committerNorbert Preining <preining@logic.at>2009-06-08 14:57:10 +0000
commit95eb7ead780f7de930d678a7ba295b27fa6d587e (patch)
tree6d06b40304d8b7a7c3dabda132d982900c73b7ed /Master/tlpkg/TeXLive/TLPaper.pm
parentde09651f8c907cf30b668e414ff9da7b1f232a6e (diff)
rework execute action handling so that it actually works, hopefully
that means that: - handle_ret_hash is renamed to handle_execute_actions - make_ret_hash_from_execute is gone and replaced by TLUtils::announce_execute_actions git-svn-id: svn://tug.org/texlive/trunk@13671 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPaper.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLPaper.pm36
1 files changed, 15 insertions, 21 deletions
diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm
index 301d6abb65a..66e39adeb07 100644
--- a/Master/tlpkg/TeXLive/TLPaper.pm
+++ b/Master/tlpkg/TeXLive/TLPaper.pm
@@ -139,8 +139,7 @@ sub get_paper_list {
=item C<do_paper($prog,$texmfsysconfig,@args)>
-Call the paper subroutine for C<$prog>, passing args. Return hash of
-necessary post-install programs for C<handle_ret_hash> to run.
+Call the paper subroutine for C<$prog>, passing args.
=cut
@@ -166,11 +165,9 @@ hashes.
=cut
sub paper_all {
- my %ret;
for my $p (sort keys %paper_sub) {
- merge_into(\%ret, &{$paper_sub{$p}} (@_));
+ &{$paper_sub{$p}} (@_);
}
- return \%ret;
}
@@ -212,7 +209,7 @@ sub paper_xdvi {
my $newpaper = shift;
my $inp = &find_paper_file("xdvi", "other text files", "XDvi");
- return () unless $inp;
+ return unless $inp;
my $outcomp = $paper_config_path_component{"xdvi"}
|| $default_paper_config_path_component{"xdvi"};
@@ -242,14 +239,13 @@ sub paper_xdvi {
sub paper_pdftex {
my $outtree = shift;
my $newpaper = shift;
- my %ret;
my $outcomp = $paper_config_path_component{"pdftex"}
|| $default_paper_config_path_component{"pdftex"};
my $outfile = "$outtree/$outcomp";
my $inp = &find_paper_file("pdftex", "tex", "pdftexconfig.tex");
- return () unless $inp;
+ return unless $inp;
open(FOO, "<$inp") || die "$0: open($inp) failed: $!";
my @lines = <FOO>;
@@ -338,15 +334,16 @@ sub paper_pdftex {
info("$0: setting paper size for pdftex to $newpaper.\n");
mkdirhier(dirname($outfile));
# if we create the outfile we have to call mktexlsr
- $ret{"mktexlsr"} = 1 unless (-r $outfile);
+ TeXLive::TLUtils::announce_execute_actions("files-changed")
+ unless (-r $outfile);
if (!open(TMP, ">$outfile")) {
tlwarn("$0: Cannot write to $outfile: $!\n");
tlwarn("Not setting paper size for pdftex.\n");
- return ();
+ return;
}
for (@lines) { print TMP; }
close(TMP) || warn "$0: close(>$outfile) failed: $!";
- $ret{"format-regenerate"} = 1;
+ TeXLive::TLUtils::announce_execute_actions("regenerate-formats");
} else {
tlwarn("$0: Not a valid paper size for pdftex: $newpaper\n");
}
@@ -354,7 +351,6 @@ sub paper_pdftex {
} else {
info("Current pdftex paper size (from $inp): $currentpaper\n");
}
- return \%ret;
}
@@ -388,10 +384,9 @@ sub paper_pdftex {
sub paper_dvips {
my $outtree = shift;
my $newpaper = shift;
- my %ret;
my $inp = &find_paper_file("dvips", "dvips config", "config.ps");
- return () unless $inp;
+ return unless $inp;
my $outcomp = $paper_config_path_component{"dvips"}
|| $default_paper_config_path_component{"dvips"};
@@ -461,7 +456,8 @@ sub paper_dvips {
info("$0: setting paper size for dvips to $newpaper.\n");
mkdirhier(dirname($outfile));
# if we create the outfile we have to call mktexlsr
- $ret{"mktexlsr"} = 1 unless (-r $outfile);
+ TeXLive::TLUtils::announce_execute_actions("files-changed")
+ unless (-r $outfile);
if (!open(TMP, ">$outfile")) {
tlwarn("$0: Cannot write to $outfile: $!\n");
tlwarn("Not setting paper size for dvips.\n");
@@ -476,7 +472,6 @@ sub paper_dvips {
} else {
info("Current dvips paper size (from $inp): $papersizes[0]\n");
}
- return \%ret;
}
@@ -587,8 +582,6 @@ sub paper_context {
sub paper_do_simple {
my ($inp, $prog, $firstre, $secondre, $bl, $outp, $paplist, $defaultpaper, $defaultline, $newpaper) = @_;
- my %ret;
-
debug("file used for $prog: $inp\n");
open(FOO, "<$inp") or die("cannot open file $inp: $!");
@@ -648,7 +641,8 @@ sub paper_do_simple {
info("$0: setting paper size for $prog to $newpaper.\n");
mkdirhier(dirname($outp));
# if we create the outfile we have to call mktexlsr
- $ret{"mktexlsr"} = 1 unless (-r $outp);
+ TeXLive::TLUtils::announce_execute_actions("files-changed")
+ unless (-r $outp);
if (!open(TMP, ">$outp")) {
tlwarn("$0: Cannot write to $outp: $!\n");
tlwarn("Not setting paper size for $prog.\n");
@@ -656,7 +650,8 @@ sub paper_do_simple {
}
for (@newlines) { print TMP; }
close(TMP) || warn "$0: close(>$outfile) failed: $!";
- $ret{"format-regenerate"} = 1 if $prog eq "context";
+ TeXLive::TLUtils::announce_execute_actions("regenerate-formats")
+ if ($prog eq "context");
} else {
tlwarn("$0: Not a valid paper size for $prog: $newpaper\n");
}
@@ -665,7 +660,6 @@ sub paper_do_simple {
# return the current value
info("Current $prog paper size (from $inp): $currentpaper\n");
}
- return \%ret;
}
1;