summaryrefslogtreecommitdiff
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
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
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm23
-rw-r--r--Master/tlpkg/TeXLive/TLTREE.pm13
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/xetex.tlpsrc8
5 files changed, 43 insertions, 11 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);
}
diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm
index 286518d44ee..a7b0e4cd5d8 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -179,15 +179,18 @@ sub size_of {
sub get_matching_files {
my ($self, $type, $p) = @_;
if ($type eq "bin") {
+ my %returnfiles;
# binpatterns can have an additions specifier after the prefix: /ARCH
# which specifies that these patterns are ONLY for the specified arch!
- if ($p =~ m!^(\w+)/(\w+)\s+(.*)$!) {
- my @foo = $self->_get_matching_files($type,"$1 $3");
- $returnfiles{$2} = [ @foo ];
+ if ($p =~ m!^(\w+)/([-a-z0-9]+)\s+(.*)$!) {
+ my $pt = $1;
+ my $aa = $2;
+ my $pr = $3;
+ my @foo = $self->_get_matching_files($type,"$pt $pr");
+ $returnfiles{$aa} = [ @foo ];
return(\%returnfiles);
}
# we first substitute arch for ${ARCH}
- my %returnfiles;
foreach $a ($self->architectures) {
# return empty list of arch!=win32 and pattern matches bin/win32
if (($p =~ m@f bin/win32/@) && ($a ne "win32")) {
@@ -215,7 +218,7 @@ sub _get_matching_files {
if ($pattype eq "t") {
@matchfiles = $self->_get_files_matching_dir_pattern($type,$patdata,@rest);
} elsif ($pattype eq "f") {
- @matchfiles = $self->_get_files_matching_glob_pattern($type,$patdata,$arch);
+ @matchfiles = $self->_get_files_matching_glob_pattern($type,$patdata);
} elsif ($pattype eq "r") {
@matchfiles = $self->_get_files_matching_regexp_pattern($type,$patdata);
} elsif ($pattype eq "d") {
diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
index 7fbe50b2bbf..e74e170217d 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
@@ -20,6 +20,7 @@ runpattern d tlpkg/installer
#
# but no lzma binaries
runpattern !d tlpkg/installer/lzma
+runpattern !d tlpkg/installer/wget
#
# and no perl lib
runpattern !d tlpkg/installer/perllib
@@ -37,6 +38,7 @@ binpattern f/win32 install-tl.bat
# binpattern f/win32 tl-portable.bat
binpattern f/win32 install-tl.bat.manifest
binpattern f tlpkg/installer/lzma/lzmadec.${ARCH}
-binpattern d tlpkg/installer/wget
+binpattern f tlpkg/installer/wget/wget.${ARCH}
+binpattern f/win32 tlpkg/installer/wget/wget.exe
# why the above does not catch that one I don't know ... so add it
binpattern f/win32 tlpkg/installer/lzma/lzmadec.win32.exe
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 8e8757140b5..fb2de1bd9f6 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -25,4 +25,8 @@ binpattern f/win32 tlpkg/installer/lzma/lzma.exe
binpattern f/win32 tlpkg/installer/wget/wget.exe
binpattern f tlpkg/installer/lzma/lzmadec.${ARCH}
binpattern f tlpkg/installer/lzma/lzma.${ARCH}
-binpattern f tlpkg/installer/wget/wget.${ARCH}
+# for some additional platforms we provide wget, too, list them specifically
+# to get rid of warning of not hit pattern
+# binpattern f tlpkg/installer/wget/wget.${ARCH}
+binpattern f/i386-darwin tlpkg/installer/wget/wget.i386-darwin
+binpattern f/powerpc-darwin tlpkg/installer/wget/wget.powerpc-darwin
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index a1ba1358a23..95e677b822d 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -5,8 +5,12 @@ execute BuildFormat xetex
runpattern f texmf/fmtutil/format.xetex.cnf
#
# these are only needed for darwin only.
-binpattern f bin/${ARCH}/T1Wrap
-binpattern f bin/${ARCH}/xdv2pdf
+# use the arch specific patterns to get rid of many warning of not hit patterns
+#binpattern f bin/${ARCH}/xdv2pdf
+binpattern f/powerpc-darwin bin/powerpc-darwin/T1Wrap
+binpattern f/i386-darwin bin/i386-darwin/T1Wrap
+binpattern f/powerpc-darwin bin/powerpc-darwin/xdv2pdf
+binpattern f/i386-darwin bin/i386-darwin/xdv2pdf
#
docpattern d texmf-dist/doc/xetex/base
runpattern d texmf-dist/fonts/misc/xetex/fontmapping/base