xindy-new update

git-svn-id: svn://tug.org/texlive/trunk@16331 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 65 insertions, 3 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 19adbb5914b..960d66ff256 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,3 +1,7 @@
+2009-12-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-21-TL-no-date (new): Avoid date in latin.xdy.
+
 2009-12-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-50-reorg-alphabets (new): Reorganize alphabets.
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-21-TL-no-date b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-21-TL-no-date
new file mode 100644
index 00000000000..163625fa1b1
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-21-TL-no-date
@@ -0,0 +1,17 @@
+	For TL we prefer not to have files that differ just by the date.
+
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/inputenc/Makefile.am xindy/make-rules/inputenc/Makefile.am
+--- xindy.orig/make-rules/inputenc/Makefile.am	2009-12-03 01:31:28.000000000 +0100
++++ xindy/make-rules/inputenc/Makefile.am	2009-12-07 23:42:02.000000000 +0100
+@@ -41,7 +41,11 @@
+ 	latin3.xdy
+ 
+ latin.xdy : latin1.xdy latin2.xdy latin3.xdy
++if TEXLIVE_BUILD
++	echo ';; Generated for TeX Live from $+' >latin.xdy
++else !TEXLIVE_BUILD
+ 	echo ';; Generated at' `date` 'from latin?.xdy' >latin.xdy
++endif !TEXLIVE_BUILD
+ 	echo >>latin.xdy
+ 	sort -u latin?.xdy | grep -v '^;' >>latin.xdy
+ 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.am
index a112b9c28e8..80070515ce2 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.am
@@ -41,7 +41,11 @@ INPUTENCS = \
 	latin3.xdy
 
 latin.xdy : latin1.xdy latin2.xdy latin3.xdy
+if TEXLIVE_BUILD
+	echo ';; Generated for TeX Live from $+' >latin.xdy
+else !TEXLIVE_BUILD
 	echo ';; Generated at' `date` 'from latin?.xdy' >latin.xdy
+endif !TEXLIVE_BUILD
 	echo >>latin.xdy
 	sort -u latin?.xdy | grep -v '^;' >>latin.xdy
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.in
index 0359aff945a..ea99c8cba42 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.in
@@ -487,7 +487,8 @@ uninstall-am: uninstall-nodist_inputencDATA
 
 
 latin.xdy : latin1.xdy latin2.xdy latin3.xdy
-	echo ';; Generated at' `date` 'from latin?.xdy' >latin.xdy
+@TEXLIVE_BUILD_TRUE@	echo ';; Generated for TeX Live from $+' >latin.xdy
+@TEXLIVE_BUILD_FALSE@	echo ';; Generated at' `date` 'from latin?.xdy' >latin.xdy
 	echo >>latin.xdy
 	sort -u latin?.xdy | grep -v '^;' >>latin.xdy
 
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 7d244c790fc..1cdc662f3e7 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/xindy.in
+++ b/Build/source/utils/xindy-new/xindy/user-commands/xindy.in
@@ -286,11 +286,44 @@ BEGIN {
 # Determine environment. Where is our library directory, and our modules?
 
 use File::Basename;
-our ($cmd_dir, $cmd, $lib_dir, $modules_dir);
+use Cwd;
+our ($cmd_dir, $cmd, $rcmd_dir, $rcmd, $xindy_run, $lib_dir, $modules_dir, $path_sep);
 BEGIN {
     $cmd_dir = dirname($0);
     $cmd = basename($0);
 
+    my $rcmd_path = Cwd::realpath($0);
+    $rcmd_dir = dirname($rcmd_path);
+    $rcmd = basename($rcmd_path);
+
+    if ($rcmd eq "xindy.pl") { # TL2010
+
+	if ($^O eq "MSWin32" || $^O eq "cygwin") {
+	    $xindy_run = "xindy-lisp.exe";
+	    $path_sep = ";";
+	} else {
+	    $xindy_run = "xindy.run";
+	    $path_sep = ":";
+	}
+	$modules_dir = "$rcmd_dir/../../xindy/modules";
+	die "$cmd: Cannot locate xindy modules directory" if ! -d $modules_dir;
+
+	if ($^O eq "MSWin32") {
+	    $lib_dir = "$cmd_dir/../../../bin/win32"; # TL2010 woe32
+	} else {
+	    # FIXME: this fails for symlink -> bin/ARCH/xindy
+	    # should follow all but last symlink and recompute $cmd_dir
+	    $lib_dir = $cmd_dir;
+	}
+	die "$cmd: Cannot locate xindy.mem" if ! -f "$lib_dir/xindy.mem";
+
+	# TODO: drop xindy.v2 (only for TL?)
+	# TODO: modify call_xindy() to use "$lib_dir/$xindy_run" if it exists
+	# TODO: maybe drop $path_sep
+	# TODO: maybe two subroutines for TL2010 and !TL2010 part
+
+    } else { # !TL2010
+
     # library directory
     if ( $ENV{XINDY_LIBDIR} ) {
 	$lib_dir = $ENV{XINDY_LIBDIR};
@@ -316,6 +349,7 @@ BEGIN {
     } else {
 	die "$cmd: Cannot locate xindy modules directory";
     }
+    } # !TL2010
 }
 
 
@@ -711,7 +745,9 @@ sub output_version ( ;$ ) {		# optional arg: internal-version flag
 sub output_xindy_release () {
     my $version = 'unknown';
     my $version_file;
-    if ( -f "$cmd_dir/../VERSION" ) {
+    if ( -f "$modules_dir/../VERSION" ) {
+	$version_file = "$modules_dir/../VERSION";
+    } elsif ( -f "$cmd_dir/../VERSION" ) {
 	$version_file = "$cmd_dir/../VERSION";
     } elsif ( -f "$lib_dir/VERSION" ) {
 	$version_file = "$lib_dir/VERSION";