From d610c94739d2989e49508205f49e7ae7ccc8d0b7 Mon Sep 17 00:00:00 2001 From: Piotr Strzelczyk Date: Fri, 4 Dec 2009 01:42:34 +0000 Subject: dvigif has its own wrapper, fix fmtutil check and clean up git-svn-id: svn://tug.org/texlive/trunk@16289 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/check-wrapper-consistency | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'Master/tlpkg/bin') diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency index 47efde4ff8f..56b2166f748 100755 --- a/Master/tlpkg/bin/check-wrapper-consistency +++ b/Master/tlpkg/bin/check-wrapper-consistency @@ -37,14 +37,14 @@ sub main # add some additional wrappers which are not found # automatically since they are not .. symlinks on Unix. - $w{'dvigif'} = 1; - $w{'fmtutil-sys'} = 1; $w{'updmap'} = 1; $w{'updmap-sys'} = 1; chomp (my $srcdir = `cd $Master/../Build/source/texk/texlive && pwd`); $cww = "$srcdir/w32_wrapper/runscript.exe"; $err += &check_w32 ("win32", $cww, %w); + # extra check for fmtutil-sys.exe, which is now a copy of fmtutil.exe + $err += system ("cmp win32/fmtutil-sys.exe win32/fmtutil.exe"); return $err; } @@ -113,24 +113,9 @@ sub check_w32 closedir (DIR) || warn "closedir($DIR) failed: $!"; foreach my $f (@binfiles) { - my $cannonical = $w32canonical; - # - # .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/); - # - # dvigif.exe is now a copy of dvipng.exe - $cannonical = "$w32dir/dvipng.exe" if ($f =~ /^dvigif\.exe$/); - # - # fmtutil-sys.exe is now a copy of fmtutil.exe - $cannonical = "$w32dir/fmtutil.exe" if ($f =~ /^fmtutil-sys\.exe$/); - - $diff += system ("cmp $w32dir/$f $canonical"); + next unless ($f =~ s/\.(bat|cmd)$//); # only batch files + next if ($uw{$f}); # already checked + $diff += system ("cmp $w32dir/$f.exe $w32canonical"); } return $diff; -- cgit v1.2.3