Re: 6.0 release

[Eli Zaretskii]

> Date: Fri, 08 May 2015 17:28:01 +0300
> From: Eli Zaretskii <address@hidden>
> Cc: address@hidden
> 
> Also, I need to add a .bat batch file to invoke texindex.awk, since
> the shell script won't work on Windows.  Will write and submit it
> tomorrow.

Here it is.  Let me know if something is missing, or I can commit
this.

(I see there's an $Id$ keyword in the files -- does this one need the
same?)

Note that the batch file deliberately has the CR-LF end-of-line
format -- this is required for reliable invocation of batch files on
various Windows versions.


--- util/Makefile.am~0  2015-01-07 01:46:55.000000000 +0200
+++ util/Makefile.am    2015-05-09 13:24:39.974750000 +0300
@@ -16,7 +16,7 @@
 bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi
 nodist_noinst_SCRIPTS = txixml2texi
 
-w32_bat = makeinfo.bat pod2texi.bat texi2any.bat
+w32_bat = makeinfo.bat pod2texi.bat texi2any.bat texindex.bat
 if HOST_IS_WINDOWS
  bin_SCRIPTS += $(w32_bat)
 endif


--- NUL 1970-01-01 02:00:00.000000000 +0200
+++ util/texindex.bat   2015-05-09 13:19:45.146625000 +0300
@@ -0,0 +1,58 @@
address@hidden off
+REM Copyright 2015 Free Software Foundation, Inc.
+REM
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; either version 3 of the License,
+REM or (at your option) any later version.
+REM
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM
+REM You should have received a copy of the GNU General Public License
+REM along with this program.  If not, see <http://www.gnu.org/licenses/>.
+REM
+REM Originally written by Eli Zaretskii.
+REM Please send bug reports, etc. to address@hidden
+REM 
+REM Batch file wrapper for the texindex.awk program.
+REM See the texindex shell script for more rationale.
+REM
+setlocal
+REM Directory where this script lives with a trailing backslash
+set mydir=%~dp0
+REM Allow the user override the awk interpreter location
+set awkbinary=
+if "%TEXINDEX_AWK%" == "" goto DefaultAwk
+set awkbinary=%TEXINDEX_AWK%
+if exist "%awkbinary%.exe" goto UserAwk
+if exist "%awkbinary%" goto UserAwk
+echo %0: TEXINDEX_AWK environment variable set, but its value
+echo %0: is not a readable file.  Ignoring TEXINDEX_AWK.
+:DefaultAwk
+set awkbinary=gawk
+:UserAwk
+REM Find the texindex.awk script file
+set tiscript=
+if "%TEXINDEX_SCRIPT%" == "" goto DefaultScript
+set tiscript=%TEXINDEX_SCRIPT%
+if exist "%tiscript%" goto UserScript
+echo %0: TEXINDEX_SCRIPT environment variable set, but its value
+echo %0: is not a readable file.  Ignoring TEXINDEX_SCRIPT.
+:DefaultScript
+REM In the development tree, the script is in ../texindex/
+set tiscript="%mydir%..\texindex\texindex.awk"
+if exist %tiscript% goto UserScript
+REM The installed script should be in the ../share/ directory relative to us
+set tiscript="%mydir%..\share\texindex.awk"
+REM If not found, abort
+if exist %tiscript% goto UserScript
+echo %0: could not locate texindex.awk script, quitting
+exit /b 1
+:UserScript
+REM Finally, invoke the script
+REM We do not use zeroth arg here because Gawk will interpret
+REM backslashes in the name such that e.g. \t becomes a TAB
+"%awkbinary%" -v Invocation_name="%~nx0" -f "%tiscript%" -- %*