summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-06 23:56:11 +0000
committerKarl Berry <karl@freefriends.org>2009-09-06 23:56:11 +0000
commit2178272607bfd8c2ed3a2c784629142ee808c607 (patch)
tree0d52b65361831546266b360d2af5fce40d4a55ee
parentb31d3f8b0397dbc29beaa4c991ff77d90d703e10 (diff)
consistency fixes
git-svn-id: svn://tug.org/texlive/trunk@15168 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/utils/README1
-rwxr-xr-xMaster/tlpkg/bin/check-wrapper-consistency15
-rw-r--r--Master/tlpkg/tlpsrc/babel.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc2
4 files changed, 14 insertions, 5 deletions
diff --git a/Build/source/utils/README b/Build/source/utils/README
index 165fe2ec6b0..3d2c40d472f 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -33,6 +33,7 @@ vlna 1.2 - checked 26jun08
ftp://math.feld.cvut.cz/pub/olsak/vlna
xz 4.999.9beta - checked 28aug09
+ http://tukaani.org/xz/
not done as part of normal build, here to provide sources for the
binaries we distribute. Also so we can provide exactly the same
version on all platforms; even if a newer version has been released,
diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index ef1b46b58b4..a2699ecd2c5 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -84,7 +84,7 @@ sub unx_wrapper_entries
-# windows is special, as usual. given the list of wrappers in UW, check
+# Windows is special, as usual. Given the list of wrappers in UW, check
# that each of those entries exists in W32DIR as a .exe, and is a copy
# of the canonical w32 wrapper specified in W32CANONICAL.
#
@@ -96,6 +96,7 @@ sub check_w32
for my $k (sort keys %uw) {
my $target = $uw{$k};
next if $target =~ /context/; # does things its own way
+ next if $target =~ /listings-ext/; # shell script
next if $target =~ /man/; # no symlink
next if $target =~ /ps4pdf/; # has its own .bat
next if $target =~ /simpdftex/; # shell script
@@ -111,9 +112,15 @@ sub check_w32
closedir (DIR) || warn "closedir($DIR) failed: $!";
foreach my $f (@binfiles) {
- next if ($f =~ /^tlmgr\.bat$/); # .exe would prevent tlmgr update --self!
- next if ($f =~ /^tl-w32-wrapper\.cmd$/); # no .exe stub for the universal wrapper
- next unless ($f =~ s/\.(bat|cmd)$/\.exe/); # only if batch file
+ # .exe would prevent tlmgr update --self!
+ next if ($f =~ /^tlmgr\.bat$/);
+ #
+ # no .exe stub for the universal wrapper:
+ next if ($f =~ /^tl-w32-wrapper\.cmd$/);
+ #
+ # only if batch file:
+ next unless ($f =~ s/\.(bat|cmd)$/\.exe/);
+
$diff += system ("cmp $w32dir/$f $w32canonical");
}
diff --git a/Master/tlpkg/tlpsrc/babel.tlpsrc b/Master/tlpkg/tlpsrc/babel.tlpsrc
index e69de29bb2d..6c04502777f 100644
--- a/Master/tlpkg/tlpsrc/babel.tlpsrc
+++ b/Master/tlpkg/tlpsrc/babel.tlpsrc
@@ -0,0 +1 @@
+docpattern +!d texmf-dist/source/latex/thailatex/babel
diff --git a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
index c31c645cfb2..4c50b240ade 100644
--- a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
@@ -7,4 +7,4 @@ runpattern d texmf/fonts/map/dvipdfmx
binpattern f bin/${ARCH}/dvipdfmx
binpattern f bin/${ARCH}/ebb
binpattern f bin/${ARCH}/extractbb
-docpattern d texmf/doc/man/man1/extractbb*
+docpattern f texmf/doc/man/man1/extractbb*