From 39b3116f53db86a63486c24c1bb3b397f18aa95f Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 29 Jun 2015 08:08:59 +0000 Subject: utils/xindy: Sync with MikTeX git-svn-id: svn://tug.org/texlive/trunk@37706 c570f23f-e606-0410-a88d-b1316a301751 --- .../utils/xindy/xindy-2.5.1-PATCHES/ChangeLog | 6 ++- .../patch-02-win32-paths-with-spaces | 46 +++++++++++++++++++--- .../utils/xindy/xindy-2.5.1/user-commands/xindy.1 | 2 +- .../utils/xindy/xindy-2.5.1/user-commands/xindy.in | 14 +++++-- 4 files changed, 58 insertions(+), 10 deletions(-) diff --git a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog index c744a0825cb..478047cc3e1 100644 --- a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog +++ b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog @@ -1,4 +1,8 @@ -2014-10-24 Peter Breitenlohner +2014-10-29 Peter Breitenlohner + + * patch-02-win32-paths-with-spaces: Sync with MikTeX. + +2014-10-27 Peter Breitenlohner * patch-02-win32-paths-with-spaces: Also quotify filter. diff --git a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces index 600cc8f4a76..d54ada1138f 100644 --- a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces +++ b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces @@ -1,6 +1,6 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xindy.1 xindy-2.5.1/user-commands/xindy.1 --- xindy-2.5.1.orig/user-commands/xindy.1 2014-05-29 22:26:05.000000000 +0200 -+++ xindy-2.5.1/user-commands/xindy.1 2015-06-27 11:32:08.000000000 +0200 ++++ xindy-2.5.1/user-commands/xindy.1 2015-06-29 10:02:12.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) @@ -12,14 +12,50 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind .\" .IX Title "xindy 1" -.TH xindy 1 "2014-05-29" "Release 2.5.1" "xindy" -+.TH xindy 1 "2015-06-27" "Release 2.5.1" "xindy" ++.TH xindy 1 "2015-06-29" "Release 2.5.1" "xindy" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xindy.in xindy-2.5.1/user-commands/xindy.in --- xindy-2.5.1.orig/user-commands/xindy.in 2014-10-24 10:38:47.000000000 +0200 -+++ xindy-2.5.1/user-commands/xindy.in 2015-06-27 11:31:46.000000000 +0200 -@@ -706,6 +706,7 @@ ++++ xindy-2.5.1/user-commands/xindy.in 2015-06-29 10:02:00.000000000 +0200 +@@ -394,7 +394,7 @@ + # FIXME: In standalone installations, modules are still placed in lib + # directory. This is not conformant to FHS. + +-if ( $is_TL ) { # TeX Live and MikTeX ++if ( $is_TL ) { # TeX Live, MiKTeX, or W32TeX + + $modules_dir = Cwd::realpath("$cmd_dir/../../xindy/modules"); + die "$cmd: Cannot locate xindy modules directory" unless -d $modules_dir; +@@ -402,8 +402,12 @@ + if ( $is_w32 ) { + if ( -d "$cmd_dir/../../../bin/win32" ) { # TeX Live + $cmd_dir = "$cmd_dir/../../../bin/win32"; +- } elsif ( -d "$cmd_dir/../../miktex/bin" ) { # MikTeX +- $cmd_dir = "$cmd_dir/../../miktex/bin"; ++ } elsif ( -d "$cmd_dir/../../miktex/bin/x64/internal" ) { # MiKTeX 64-bit ++ $cmd_dir = "$cmd_dir/../../miktex/bin/x64/internal"; ++ } elsif ( -d "$cmd_dir/../../miktex/bin/internal" ) { # MiKTeX 32-bit ++ $cmd_dir = "$cmd_dir/../../miktex/bin/internal"; ++ } elsif ( -d "$cmd_dir/../../../../bin" ) { # W32TeX ++ $cmd_dir = "$cmd_dir/../../../../bin"; + } else { + die "$cmd: Cannot locate bin directory"; + } +@@ -626,7 +630,11 @@ + usage(1); + } + my ($name, $path, $suffix) = fileparse ($ARGV[0], '\.[^\.]+'); ++ if ($path eq ".\\") { ++ $outfile = "$name.ind"; ++ } else { + $outfile = "$path$name.ind"; ++ } + } + + # FIXME: xindy wants a log file. Really? +@@ -706,6 +714,7 @@ my $output = tmpnam(); push (@temp_files, $output); $output=quotify($output); @@ -27,7 +63,7 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind print "Running filter: $filter <$input >$output\n" if $verbose; system "$filter <$input >$output"; print "filtered xindy input file: $output\n" if $debug{script}; -@@ -765,7 +766,7 @@ +@@ -765,7 +774,7 @@ @codepages = qw(latin cp iso8859 ascii utf8) unless @codepages; my @styles; foreach my $cp ( @codepages ) { diff --git a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 index deb188ad4b6..9f96b205cb0 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 +++ b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "xindy 1" -.TH xindy 1 "2015-06-27" "Release 2.5.1" "xindy" +.TH xindy 1 "2015-06-29" "Release 2.5.1" "xindy" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in index b51f220c0a6..50104cad47c 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in +++ b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in @@ -394,7 +394,7 @@ $TMPDIR = "."; # FIXME: In standalone installations, modules are still placed in lib # directory. This is not conformant to FHS. -if ( $is_TL ) { # TeX Live and MikTeX +if ( $is_TL ) { # TeX Live, MiKTeX, or W32TeX $modules_dir = Cwd::realpath("$cmd_dir/../../xindy/modules"); die "$cmd: Cannot locate xindy modules directory" unless -d $modules_dir; @@ -402,8 +402,12 @@ if ( $is_TL ) { # TeX Live and MikTeX if ( $is_w32 ) { if ( -d "$cmd_dir/../../../bin/win32" ) { # TeX Live $cmd_dir = "$cmd_dir/../../../bin/win32"; - } elsif ( -d "$cmd_dir/../../miktex/bin" ) { # MikTeX - $cmd_dir = "$cmd_dir/../../miktex/bin"; + } elsif ( -d "$cmd_dir/../../miktex/bin/x64/internal" ) { # MiKTeX 64-bit + $cmd_dir = "$cmd_dir/../../miktex/bin/x64/internal"; + } elsif ( -d "$cmd_dir/../../miktex/bin/internal" ) { # MiKTeX 32-bit + $cmd_dir = "$cmd_dir/../../miktex/bin/internal"; + } elsif ( -d "$cmd_dir/../../../../bin" ) { # W32TeX + $cmd_dir = "$cmd_dir/../../../../bin"; } else { die "$cmd: Cannot locate bin directory"; } @@ -626,7 +630,11 @@ sub parse_options() { usage(1); } my ($name, $path, $suffix) = fileparse ($ARGV[0], '\.[^\.]+'); + if ($path eq ".\\") { + $outfile = "$name.ind"; + } else { $outfile = "$path$name.ind"; + } } # FIXME: xindy wants a log file. Really? -- cgit v1.2.3