texlive[59893] better xindy version output

[commits+karl at tug.org]

Revision: 59893
          http://tug.org/svn/texlive?view=revision&revision=59893
Author:   karl
Date:     2021-07-11 00:16:04 +0200 (Sun, 11 Jul 2021)
Log Message:
-----------
better xindy version output

Modified Paths:
--------------
    trunk/Build/source/utils/xindy/ChangeLog
    trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in

Property Changed:
----------------
    trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in

Modified: trunk/Build/source/utils/xindy/ChangeLog
===================================================================
--- trunk/Build/source/utils/xindy/ChangeLog	2021-07-10 21:05:34 UTC (rev 59892)
+++ trunk/Build/source/utils/xindy/ChangeLog	2021-07-10 22:16:04 UTC (rev 59893)
@@ -1,3 +1,15 @@
+2021-07-10  Karl Berry  <karl at freefriends.org>
+
+	* xindy-src/user-commands/xindy.in: append TL svn revision to
+	xindy.pl version number (1.18), and move $is_TL assignment to
+	before $VERSION computation. Expand $Revision$ keyword in TL repo.
+	
+	Move Mac .mem cases to above parse_options, so --version 
+	and --internal-version work.
+	
+	(call_xindy, ..., xindy_expression): forward decls of functions
+	to avoid prototype warnings.
+
 2021-07-06  Karl Berry  <karl at tug.org>
 
 	* xindy-src/user-commands/xindy.in: for the Mac,

Modified: trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
===================================================================
--- trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in	2021-07-10 21:05:34 UTC (rev 59892)
+++ trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in	2021-07-10 22:16:04 UTC (rev 59893)
@@ -319,7 +319,7 @@
 
 =head1 LEGALESE
 
-Copyright (c) 2004-2014 by Joachim Schrod.
+Copyright (c) 2004-2021 by Joachim Schrod.
 
 B<xindy> is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -340,9 +340,16 @@
 use strict;
 use English qw(-no_match_vars);
 
-our $VERSION = sprintf "%d.%02d", q$Revision: 1.18 $ =~ /: (\d+)\.(\d+)/ ;
+our $is_TL = ( '@is_TL@' eq 'yes' );
 
+our $VERSION = sprintf "%d.%02d", q$xRevision: 1.18 $ =~ /: (\d+)\.(\d+)/ ;
+if ($is_TL) {
+    # Until xindy is actively maintained upstream, let's make
+    # changes in TL be reflected in different version numbers.
+    $VERSION .= sprintf ".TL%d", q$Revision$ =~ /: (\d+)/ ; # TL rev
+}
 
+
 # Used modules.
 
 use Cwd;
@@ -353,10 +360,17 @@
 use Getopt::Long qw(:config bundling);
 use POSIX qw(uname);
 
+# Forward declarations for prototypes.
 
+sub call_xindy ($$);
+sub create_raw_index ();
+sub filter_index ($$);
+sub handle_signals ();
+sub parse_options ();
+sub xindy_expression ();
+
 # Determine environment. Where is our library directory, and our modules?
 
-our $is_TL = ( '@is_TL@' eq 'yes' );
 our $is_w32 = ( $OSNAME =~ /^MSWin/i ) ;
 our $path_sep = ( $is_w32 ? ';' : ':' ) ;
 our $is_windows = ( $is_w32 || $OSNAME eq 'cygwin' ) ;
@@ -501,10 +515,6 @@
 $input_markup = 'latex';
 $mem_file = "$lib_dir/xindy.mem";
 
-my @orig_argv = @ARGV;
-parse_options();
-
-
 # Support universal binary on Mac OS X.
 
 if ( $OSNAME eq 'darwin'  &&  ! -e $mem_file ) {
@@ -519,6 +529,11 @@
 	$mem_file = "$lib_dir/xindy-i386.mem";
     }
 }
+
+my @orig_argv = @ARGV;
+parse_options();
+
+# might get overridden
 die "$cmd: Cannot locate $mem_file"  unless -e $mem_file;
 
 
@@ -928,6 +943,8 @@
 
 
 #======================================================================
+# (modified several times for TeX Live; see
+#  Build/source/utils/xindy/ChangeLog)
 #
 # $Log: xindy.pl,v $
 # Revision 1.18  2011/01/18 22:18:29  jschrod


Property changes on: trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Revision
\ No newline at end of property