summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-12-10 13:15:11 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-12-10 13:15:11 +0000
commitb96fcaabab7a46d76c145fb3c4c2557668e4a365 (patch)
tree89976158bbf5b6aee5c1527ceccc42d0ee5c0c05 /Build
parent8265917d7242b5ae229884d755579a3f6c216cea (diff)
xindy-new update
git-svn-id: svn://tug.org/texlive/trunk@16343 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog9
-rw-r--r--Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes3
-rw-r--r--Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v230
-rw-r--r--Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-24-TL-use-xindy_run53
-rw-r--r--Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-25-subst-in-texindy69
-rw-r--r--Build/source/utils/xindy-new/xindy/user-commands/Makefile.am23
-rw-r--r--Build/source/utils/xindy-new/xindy/user-commands/Makefile.in23
-rw-r--r--[-rwxr-xr-x]Build/source/utils/xindy-new/xindy/user-commands/texindy.in (renamed from Build/source/utils/xindy-new/xindy/user-commands/texindy)0
-rw-r--r--Build/source/utils/xindy-new/xindy/user-commands/xindy.in33
9 files changed, 182 insertions, 61 deletions
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
index 55aba7c13e5..c1fb3d37dfc 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
@@ -1,10 +1,17 @@
+2009-12-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-24-TL-use-xindy_run (new): Invoke either 'xindy.run'
+ (actually 'lisp.run') or 'clisp'.
+ * patch-25-subst-in-texindy (new): Except for TL, substitute
+ the value of $(libdir) also in texindy and adapt Makefile.am.
+
2009-12-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-20-TL-install-dirs: For TL, do not substitute @libdir@.
* patch-22-TL-xindy_pl (new): Adapt xindy perl script for use
in TL (still incomplete). Adapting code from
Vladimir Volovich <vvv@vsu.ru> (TL2008/09 version) and
- Tomek T <t34www@googlemail.com>.
+ Tomasz M. Trzeciak <t34www@googlemail.com>.
* patch-23-drop-v2 (new): Completely drop xindy.v2.
2009-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
index fdd3a84ed76..8c9fe42e877 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
@@ -12,3 +12,6 @@ Removed:
missing
ylwrap
+Moved user-commands/texindy => user-commands/texindy.in and removed
+ execute permissions.
+
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2 b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2
index f64bcf93fae..88e87149858 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2
@@ -32,7 +32,19 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am x
diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xindy/user-commands/xindy.in
--- xindy.orig/user-commands/xindy.in 2009-12-09 11:50:09.000000000 +0100
+++ xindy/user-commands/xindy.in 2009-12-09 12:25:35.000000000 +0100
-@@ -433,10 +433,16 @@
+@@ -377,11 +377,6 @@
+
+
+ # Check arguments, store them in proper variables.
+-#
+-# Do also something for backward compatibility: Check if this is an
+-# old-style call. If it is, we have two arguments at the end, and the
+-# second-to-last has the extension ".xdy". Then, call the old driver
+-# script with the original arguments...
+
+ sub usage ( ;$ )
+ {
+@@ -433,12 +428,6 @@
my @orig_argv = @ARGV;
parse_options();
@@ -40,16 +52,8 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xind
- if ( $ARGV[0] =~ /\.xdy$/ ) {
- exec "$cmd_dir/xindy.v2", @orig_argv;
- }
-+if ( @ARGV == 2 && $ARGV[0] =~ /\.xdy$/ ) {
-+ print STDERR <<EOF;
-+$cmd: deprecated calling convention detected.
-+Please change your command to
-+
-+$cmd -I xindy -M $ARGV[0] $ARGV[1]
-+
-+Run "$cmd --help" for full list of options, or read the documentation.
-+EOF
-+ exit 1;
- }
-
+-}
+-
+ # This script creates temporary files. Whenever a file is created, its
+ # name is added to @temp_files. In an END handler, the temporary files
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-24-TL-use-xindy_run b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-24-TL-use-xindy_run
new file mode 100644
index 00000000000..1429f46549d
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-24-TL-use-xindy_run
@@ -0,0 +1,53 @@
+ Invoke either 'xindy.run' or 'clisp'.
+
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xindy/user-commands/xindy.in
+--- xindy.orig/user-commands/xindy.in 2009-12-09 12:25:35.000000000 +0100
++++ xindy/user-commands/xindy.in 2009-12-10 10:57:20.000000000 +0100
+@@ -287,13 +287,19 @@
+
+ use File::Basename;
+ use Cwd;
+-our ($isW32, $r0, $xindy_run);
++our ($isW32, $r0, $clisp);
+ our ($cmd_dir, $cmd, $lib_dir, $modules_dir);
+ BEGIN {
+ $isW32 = ($^O =~ /^MSWin/i) ? 1 : 0;
+ $r0 = Cwd::realpath($0);
+ $cmd = basename($r0);
+
++ if ($isW32 || $^O eq "cygwin") {
++ $clisp = "clisp.exe";
++ } else {
++ $clisp = "clisp";
++ }
++
+ # FIXME: make two subroutines for TL2010 and !TL2010 part
+
+ if ($cmd eq "xindy.pl") { # TL2010
+@@ -325,15 +331,13 @@
+
+ $lib_dir = $cmd_dir;
+
++ my $xindy_run;
+ if ($isW32 || $^O eq "cygwin") {
+ $xindy_run = "$lib_dir/xindy-lisp.exe";
+ } else {
+ $xindy_run = "$lib_dir/xindy.run";
+ }
+- # FIXME: what I really want to do is 'undefine' or 'delete'
+- $xindy_run = "" unless -e $xindy_run;
+-
+- # FIXME: modify call_xindy() to use "$xindy_run" if it exists
++ $clisp = $xindy_run if -e $xindy_run;
+
+ } else { # !TL2010
+
+@@ -723,7 +727,7 @@
+ sub call_xindy ( $$ ) {
+ my ($mem_file, $xindy_exp) = @_;
+
+- my @command = ('clisp', '-M', $mem_file, '-E', 'iso-8859-1');
++ my @command = ($clisp, '-M', $mem_file, '-E', 'iso-8859-1');
+ if ( $interactive ) {
+ print "Proposed xindy expression:\n\n$xindy_exp\n" unless $quiet;
+ } else {
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-25-subst-in-texindy b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-25-subst-in-texindy
new file mode 100644
index 00000000000..e06800308be
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-25-subst-in-texindy
@@ -0,0 +1,69 @@
+ Substitute the value of $(libdir) also in texindy (for TL).
+
+ IMPORTANT: This patch requires to first rename
+ user-commands/texindy => user-commands/texindy.in
+ (and remove the execute permissions).
+
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
+--- xindy.orig/user-commands/Makefile.am 2009-12-09 14:17:56.000000000 +0100
++++ xindy/user-commands/Makefile.am 2009-12-10 13:53:42.000000000 +0100
+@@ -25,13 +25,12 @@
+ bin_SCRIPTS =
+
+ if TEXLIVE_BUILD
+-noinst_SCRIPTS = $(scripts)
+ scriptspath = texmf/scripts/xindy
+ scriptsdir = ${prefix}/$(scriptspath)
+-install-exec-hook: $(scripts)
++install-exec-hook:
+ $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
+ @for f in $(scripts); do \
+- $(INSTALL_SCRIPT) `test -f "$$f" || echo "$(srcdir)/"`$$f $(DESTDIR)$(scriptsdir)/$$f.pl; \
++ $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
+ done
+ case "$(bindir)" in \
+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+@@ -40,34 +39,34 @@
+ exit 1;; \
+ esac
+ install-links:
+- @cd $(DESTDIR)$(bindir) && \
++ @cd "$(DESTDIR)$(bindir)" && \
+ for f in $(scripts); do \
+ rm -f $$f; \
+- echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \
++ echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \
+ $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \
+ done
+ uninstall-hook:
+ @for f in $(scripts); do \
+- rm -f $(DESTDIR)$(bindir)/$$f; \
+- rm -f $(DESTDIR)$(scriptsdir)/$$f.pl; \
++ rm -f "$(DESTDIR)$(bindir)/$$f"; \
++ rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
+ done
+-
+-xindy: xindy.in
+- cat $(srcdir)/xindy.in >xindy
+ else !TEXLIVE_BUILD
+ bin_SCRIPTS += $(scripts)
+
++texindy: texindy.in Makefile
++ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy
++
+ xindy: xindy.in Makefile
+ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
+ endif !TEXLIVE_BUILD
+
+ man_MANS = texindy.1 xindy.1
+
+-EXTRA_DIST = $(man_MANS) texindy xindy.in
++EXTRA_DIST = $(man_MANS) texindy.in xindy.in
+
+ ## Obsolete files
+ ##
+ EXTRA_DIST += xindy.v2.1 xindy.v2.in
+
+-CLEANFILES = xindy
++CLEANFILES = $(scripts)
+
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
index 8f8e2ca2a79..502eab1cbaf 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
@@ -25,13 +25,12 @@ scripts = texindy xindy
bin_SCRIPTS =
if TEXLIVE_BUILD
-noinst_SCRIPTS = $(scripts)
scriptspath = texmf/scripts/xindy
scriptsdir = ${prefix}/$(scriptspath)
-install-exec-hook: $(scripts)
+install-exec-hook:
$(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
@for f in $(scripts); do \
- $(INSTALL_SCRIPT) `test -f "$$f" || echo "$(srcdir)/"`$$f $(DESTDIR)$(scriptsdir)/$$f.pl; \
+ $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
done
case "$(bindir)" in \
*/bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
@@ -40,34 +39,34 @@ install-exec-hook: $(scripts)
exit 1;; \
esac
install-links:
- @cd $(DESTDIR)$(bindir) && \
+ @cd "$(DESTDIR)$(bindir)" && \
for f in $(scripts); do \
rm -f $$f; \
- echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \
+ echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \
$(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \
done
uninstall-hook:
@for f in $(scripts); do \
- rm -f $(DESTDIR)$(bindir)/$$f; \
- rm -f $(DESTDIR)$(scriptsdir)/$$f.pl; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
done
-
-xindy: xindy.in
- cat $(srcdir)/xindy.in >xindy
else !TEXLIVE_BUILD
bin_SCRIPTS += $(scripts)
+texindy: texindy.in Makefile
+ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy
+
xindy: xindy.in Makefile
sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
endif !TEXLIVE_BUILD
man_MANS = texindy.1 xindy.1
-EXTRA_DIST = $(man_MANS) texindy xindy.in
+EXTRA_DIST = $(man_MANS) texindy.in xindy.in
## Obsolete files
##
EXTRA_DIST += xindy.v2.1 xindy.v2.in
-CLEANFILES = xindy
+CLEANFILES = $(scripts)
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
index 26df0f09f91..aafa3a51ca9 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
@@ -67,7 +67,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
-SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS)
SOURCES =
DIST_SOURCES =
man1dir = $(mandir)/man1
@@ -182,12 +182,11 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
scripts = texindy xindy
bin_SCRIPTS = $(am__append_1)
-@TEXLIVE_BUILD_TRUE@noinst_SCRIPTS = $(scripts)
@TEXLIVE_BUILD_TRUE@scriptspath = texmf/scripts/xindy
@TEXLIVE_BUILD_TRUE@scriptsdir = ${prefix}/$(scriptspath)
man_MANS = texindy.1 xindy.1
-EXTRA_DIST = $(man_MANS) texindy xindy.in xindy.v2.1 xindy.v2.in
-CLEANFILES = xindy
+EXTRA_DIST = $(man_MANS) texindy.in xindy.in xindy.v2.1 xindy.v2.in
+CLEANFILES = $(scripts)
all: all-am
.SUFFIXES:
@@ -463,10 +462,10 @@ uninstall-man: uninstall-man1
uninstall-binSCRIPTS uninstall-hook uninstall-man \
uninstall-man1
-@TEXLIVE_BUILD_TRUE@install-exec-hook: $(scripts)
+@TEXLIVE_BUILD_TRUE@install-exec-hook:
@TEXLIVE_BUILD_TRUE@ $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
@TEXLIVE_BUILD_TRUE@ @for f in $(scripts); do \
-@TEXLIVE_BUILD_TRUE@ $(INSTALL_SCRIPT) `test -f "$$f" || echo "$(srcdir)/"`$$f $(DESTDIR)$(scriptsdir)/$$f.pl; \
+@TEXLIVE_BUILD_TRUE@ $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
@TEXLIVE_BUILD_TRUE@ done
@TEXLIVE_BUILD_TRUE@ case "$(bindir)" in \
@TEXLIVE_BUILD_TRUE@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
@@ -475,20 +474,20 @@ uninstall-man: uninstall-man1
@TEXLIVE_BUILD_TRUE@ exit 1;; \
@TEXLIVE_BUILD_TRUE@ esac
@TEXLIVE_BUILD_TRUE@install-links:
-@TEXLIVE_BUILD_TRUE@ @cd $(DESTDIR)$(bindir) && \
+@TEXLIVE_BUILD_TRUE@ @cd "$(DESTDIR)$(bindir)" && \
@TEXLIVE_BUILD_TRUE@ for f in $(scripts); do \
@TEXLIVE_BUILD_TRUE@ rm -f $$f; \
-@TEXLIVE_BUILD_TRUE@ echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \
+@TEXLIVE_BUILD_TRUE@ echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \
@TEXLIVE_BUILD_TRUE@ $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \
@TEXLIVE_BUILD_TRUE@ done
@TEXLIVE_BUILD_TRUE@uninstall-hook:
@TEXLIVE_BUILD_TRUE@ @for f in $(scripts); do \
-@TEXLIVE_BUILD_TRUE@ rm -f $(DESTDIR)$(bindir)/$$f; \
-@TEXLIVE_BUILD_TRUE@ rm -f $(DESTDIR)$(scriptsdir)/$$f.pl; \
+@TEXLIVE_BUILD_TRUE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+@TEXLIVE_BUILD_TRUE@ rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
@TEXLIVE_BUILD_TRUE@ done
-@TEXLIVE_BUILD_TRUE@xindy: xindy.in
-@TEXLIVE_BUILD_TRUE@ cat $(srcdir)/xindy.in >xindy
+@TEXLIVE_BUILD_FALSE@texindy: texindy.in Makefile
+@TEXLIVE_BUILD_FALSE@ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy
@TEXLIVE_BUILD_FALSE@xindy: xindy.in Makefile
@TEXLIVE_BUILD_FALSE@ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/texindy b/Build/source/utils/xindy-new/xindy/user-commands/texindy.in
index 4fd94a2c679..4fd94a2c679 100755..100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/texindy
+++ b/Build/source/utils/xindy-new/xindy/user-commands/texindy.in
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/xindy.in b/Build/source/utils/xindy-new/xindy/user-commands/xindy.in
index f6c34b56f41..1d5f31f7f53 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/xindy.in
+++ b/Build/source/utils/xindy-new/xindy/user-commands/xindy.in
@@ -287,13 +287,19 @@ BEGIN {
use File::Basename;
use Cwd;
-our ($isW32, $r0, $xindy_run);
+our ($isW32, $r0, $clisp);
our ($cmd_dir, $cmd, $lib_dir, $modules_dir);
BEGIN {
$isW32 = ($^O =~ /^MSWin/i) ? 1 : 0;
$r0 = Cwd::realpath($0);
$cmd = basename($r0);
+ if ($isW32 || $^O eq "cygwin") {
+ $clisp = "clisp.exe";
+ } else {
+ $clisp = "clisp";
+ }
+
# FIXME: make two subroutines for TL2010 and !TL2010 part
if ($cmd eq "xindy.pl") { # TL2010
@@ -325,15 +331,13 @@ BEGIN {
$lib_dir = $cmd_dir;
+ my $xindy_run;
if ($isW32 || $^O eq "cygwin") {
$xindy_run = "$lib_dir/xindy-lisp.exe";
} else {
$xindy_run = "$lib_dir/xindy.run";
}
- # FIXME: what I really want to do is 'undefine' or 'delete'
- $xindy_run = "" unless -e $xindy_run;
-
- # FIXME: modify call_xindy() to use "$xindy_run" if it exists
+ $clisp = $xindy_run if -e $xindy_run;
} else { # !TL2010
@@ -377,11 +381,6 @@ use POSIX qw(uname);
# Check arguments, store them in proper variables.
-#
-# Do also something for backward compatibility: Check if this is an
-# old-style call. If it is, we have two arguments at the end, and the
-# second-to-last has the extension ".xdy". Then, call the old driver
-# script with the original arguments...
sub usage ( ;$ )
{
@@ -433,18 +432,6 @@ die "$cmd: Cannot locate $mem_file" unless -e $mem_file;
my @orig_argv = @ARGV;
parse_options();
-if ( @ARGV == 2 && $ARGV[0] =~ /\.xdy$/ ) {
- print STDERR <<EOF;
-$cmd: deprecated calling convention detected.
-Please change your command to
-
-$cmd -I xindy -M $ARGV[0] $ARGV[1]
-
-Run "$cmd --help" for full list of options, or read the documentation.
-EOF
- exit 1;
-}
-
# This script creates temporary files. Whenever a file is created, its
# name is added to @temp_files. In an END handler, the temporary files
@@ -740,7 +727,7 @@ _EOT_
sub call_xindy ( $$ ) {
my ($mem_file, $xindy_exp) = @_;
- my @command = ('clisp', '-M', $mem_file, '-E', 'iso-8859-1');
+ my @command = ($clisp, '-M', $mem_file, '-E', 'iso-8859-1');
if ( $interactive ) {
print "Proposed xindy expression:\n\n$xindy_exp\n" unless $quiet;
} else {