summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLPSRC.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-06-26 16:50:24 +0000
committerNorbert Preining <preining@logic.at>2008-06-26 16:50:24 +0000
commit5025f01a4b3c55c160efa55b5db78ef5dfc3bc6c (patch)
treee1182f06b947ddfee164ee8be8f093d27dd5f643 /Master/tlpkg/TeXLive/TLPSRC.pm
parentbb7dc23ec4668654ab989f3ec71b15a9c8b9f634 (diff)
get rid of some warnings, and fix some tlpsrc
git-svn-id: svn://tug.org/texlive/trunk@9059 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPSRC.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm23
1 files changed, 21 insertions, 2 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 099864ecc96..7a36a3b1f59 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -331,9 +331,28 @@ sub make_tlpobj
# many patterns are special for w32, don't complain about those.
# conversely, w32 fails to have many standard programs, don't
# complain about those either.
+ my $warnit = 1;
+ if ($p =~ m,bin/([-a-z0-9]+)/,) {
+ if ($1 ne "$arch") {
+ # don't warn on specific platform patterns
+ $warnit = 0;
+ }
+ }
+ if ($p =~ m,/(\S+)\s+,) {
+ # that is an arch specific pattern
+ # don't warn if we the archs do not agree
+ $warnit = 0 if ($1 ne "$arch");
+ }
+ if ($p =~ m,\$\{ARCH\}, && $arch eq "win32") {
+ # w32 fails to have many standard programs, don't complain
+ # about those either
+ $warnit = 0;
+ }
+ if ($self->{name} =~ m/\.win32/ && $arch ne "win32") {
+ $warnit = 0;
+ }
tlwarn("$self->{name} ($arch): no hit on binpattern $p\n")
- unless ($p =~ m,/win32, && $arch ne "win32")
- || ($p =~ m,\$\{ARCH\}, && $arch eq "win32");
+ if $warnit;
}
$tlp->add_binfiles($arch,@archfiles);
}