fmtutil: switch to perl version on all platforms

changes effected:
- update link for unix fmtutil
- change fmtutil-sys to call fmtutil --sys
- cp runscript.tlu to fmtutil.exe on windows
- update install-tl and tlmgr to generate fmtutil.cnf in TEXMFDIST


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

23 files changed, 61 insertions, 56 deletions

diff --git a/Master/bin/alpha-linux/fmtutil b/Master/bin/alpha-linux/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/alpha-linux/fmtutil
+++ b/Master/bin/alpha-linux/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/fmtutil b/Master/bin/amd64-freebsd/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/amd64-freebsd/fmtutil
+++ b/Master/bin/amd64-freebsd/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/fmtutil b/Master/bin/amd64-netbsd/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/amd64-netbsd/fmtutil
+++ b/Master/bin/amd64-netbsd/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/armel-linux/fmtutil b/Master/bin/armel-linux/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/armel-linux/fmtutil
+++ b/Master/bin/armel-linux/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/armhf-linux/fmtutil b/Master/bin/armhf-linux/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/armhf-linux/fmtutil
+++ b/Master/bin/armhf-linux/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/fmtutil b/Master/bin/i386-cygwin/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/i386-cygwin/fmtutil
+++ b/Master/bin/i386-cygwin/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/fmtutil b/Master/bin/i386-freebsd/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/i386-freebsd/fmtutil
+++ b/Master/bin/i386-freebsd/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/i386-linux/fmtutil b/Master/bin/i386-linux/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/i386-linux/fmtutil
+++ b/Master/bin/i386-linux/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/fmtutil b/Master/bin/i386-netbsd/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/i386-netbsd/fmtutil
+++ b/Master/bin/i386-netbsd/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/i386-solaris/fmtutil
+++ b/Master/bin/i386-solaris/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/mipsel-linux/fmtutil b/Master/bin/mipsel-linux/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/mipsel-linux/fmtutil
+++ b/Master/bin/mipsel-linux/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/powerpc-linux/fmtutil
+++ b/Master/bin/powerpc-linux/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/fmtutil b/Master/bin/sparc-solaris/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/sparc-solaris/fmtutil
+++ b/Master/bin/sparc-solaris/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/fmtutil b/Master/bin/universal-darwin/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/universal-darwin/fmtutil
+++ b/Master/bin/universal-darwin/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/win32/fmtutil.exe b/Master/bin/win32/fmtutil.exe
index 007bcff70dd..5777d90a17a 100755
--- a/Master/bin/win32/fmtutil.exe
+++ b/Master/bin/win32/fmtutil.exe
diff --git a/Master/bin/win32/runscript.tlu b/Master/bin/win32/runscript.tlu
index 3ccfb8a50be..a6c9592f345 100755
--- a/Master/bin/win32/runscript.tlu
+++ b/Master/bin/win32/runscript.tlu
@@ -246,6 +246,8 @@ local docstr = [[
         - add TEXMFDIST/fonts to the GS_LIB path. Patch by Yusuke KUROKI

     2014/04/30

         - fix for argument duplication in fmtutil

+    2015/04/12

+        - handle fmtutil-sys via fmtutil --sys

 ]]

 

 -- HELPER SUBROUTINES --

@@ -457,7 +459,9 @@ end
 local scripts4tlperl = {

   tlperl = true, 

   updmap = true, 

+  fmtutil = true,

   ['updmap-sys'] = true, 

+  ['fmtutil-sys'] = true, 

 }

 local try_extern_perl = (kpse.var_value('TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL') == '1') and 

                         not (guimode or is_restricted_progname or scripts4tlperl[progname])

@@ -523,7 +527,7 @@ PATH = prepend_path(PATH, GSDIR, BINDIR)
 os.setenv('PATH', PATH);

 

 -- sys stuff

-if (sysprog and not (progname == 'updmap')) then

+if (sysprog and not (progname == 'updmap') and not (progname == 'fmtutil')) then

   os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))

   os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))

 end

@@ -571,6 +575,10 @@ elseif progname == 'updmap' then
   if sysprog then

     argline = progname .. ' --sys ' .. argline

   end

+elseif progname == 'fmtutil' then 

+  if sysprog then

+    argline = progname .. ' --sys ' .. argline

+  end

 elseif progname == 'asy' then

   os.setenv('ASYMPTOTE_GS', GSEXE)

   os.setenv('CYGWIN', 'nodosfilewarning')

diff --git a/Master/bin/x86_64-cygwin/fmtutil b/Master/bin/x86_64-cygwin/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/x86_64-cygwin/fmtutil
+++ b/Master/bin/x86_64-cygwin/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/fmtutil b/Master/bin/x86_64-darwin/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/x86_64-darwin/fmtutil
+++ b/Master/bin/x86_64-darwin/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/fmtutil b/Master/bin/x86_64-linux/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/x86_64-linux/fmtutil
+++ b/Master/bin/x86_64-linux/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/fmtutil b/Master/bin/x86_64-solaris/fmtutil
index f34625fee30..9f1f079d5de 120000
--- a/Master/bin/x86_64-solaris/fmtutil
+++ b/Master/bin/x86_64-solaris/fmtutil
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fmtutil.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive/fmtutil.pl
\ No newline at end of file
diff --git a/Master/install-tl b/Master/install-tl
index 94104569aa9..32737e3f316 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -908,12 +908,18 @@ operations might be disturbed.\n\n";
   # $localtlpdb and this is simple code, so do it directly, i.e., duplicate
   # the code from the various generate-*.pl scripts
 
-  info("writing fmtutil.cnf to $TEXMFSYSVAR/web2c/fmtutil.cnf\n");
+  mkdirhier "$TEXDIR/texmf-dist/web2c";
+  info("writing fmtutil.cnf to $TEXDIR/texmf-dist/web2c/fmtutil.cnf\n");
   TeXLive::TLUtils::create_fmtutil($usedtlpdb,
-    "$TEXMFSYSVAR/web2c/fmtutil.cnf",
-    "$TEXMFLOCAL/web2c/fmtutil-local.cnf");
+    "$TEXDIR/texmf-dist/web2c/fmtutil.cnf");
+
+  # warn if fmtutil-local.cnf is presetn
+  if (-r "$TEXMFLOCAL/web2c/fmtutil-local.cnf") {
+    tlwarn("Old configuration file $TEXMFLOCAL/web2c/fmtutil-local.cnf found.\n");
+    tlwarn("fmtutil now reads *all* fmtutil.cnf files, so probably the easiest way\nis to rename the above file to $TEXMFLOCAL/web2c/fmtutil.cnf\n");
+  }
+    
 
-  mkdirhier "$TEXDIR/texmf-dist/web2c";
   info("writing updmap.cfg to $TEXDIR/texmf-dist/web2c/updmap.cfg\n");
   TeXLive::TLUtils::create_updmap ($usedtlpdb,
     "$TEXDIR/texmf-dist/web2c/updmap.cfg");
diff --git a/Master/texmf-dist/scripts/texlive/fmtutil-sys.sh b/Master/texmf-dist/scripts/texlive/fmtutil-sys.sh
index a272b66d007..37fb0fafc46 100755
--- a/Master/texmf-dist/scripts/texlive/fmtutil-sys.sh
+++ b/Master/texmf-dist/scripts/texlive/fmtutil-sys.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-# $Id: fmtutil-sys.sh 35626 2014-11-20 19:08:47Z karl $
-# fmtutil-sys - arrange for fmtutil to affect system directories. 
+# $Id: updmap-sys.sh 35626 2014-11-20 19:08:47Z karl $
+# fmtutil-sys - arrange for fmtutil to affect system directories.
 # Public domain.  Originally written by Thomas Esser.
 
 test -f /bin/ksh && test -z "$RUNNING_KSH" \
@@ -13,19 +13,12 @@ test -f /bin/bsh && test -z "$RUNNING_BSH" \
   && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
 unset RUNNING_BSH
 
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
 # preferentially use subprograms from our own directory.
 mydir=`echo "$0" | sed 's,/[^/]*$,,'`
 mydir=`cd "$mydir" && pwd`
 PATH="$mydir:$PATH"; export PATH
 
-v=`kpsewhich -var-value TEXMFSYSVAR`
-c=`kpsewhich -var-value TEXMFSYSCONFIG`
-
-TEXMFVAR="$v"
-TEXMFCONFIG="$c"
-export TEXMFVAR TEXMFCONFIG
+# hack around a bug in zsh:
+test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
-exec fmtutil ${1+"$@"}
+exec fmtutil --sys ${1+"$@"}
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index bc4a04e8f02..06e3c0d6156 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -789,10 +789,9 @@ sub handle_execute_actions {
     }
     my $opt_fmt = $localtlpdb->option("create_formats");
     if ($do_full) {
-      info("regenerating fmtutil.cnf in $TEXMFSYSVAR\n");
+      info("regenerating fmtutil.cnf in $TEXMFDIST\n");
       TeXLive::TLUtils::create_fmtutil($localtlpdb,
-                                       "$TEXMFSYSVAR/web2c/fmtutil.cnf",
-                                       "$TEXMFLOCAL/web2c/fmtutil-local.cnf");
+                                       "$TEXMFDIST/web2c/fmtutil.cnf");
     }
     if ($opt_fmt && !$::regenerate_all_formats) {
       # first regenerate all formats --byengine 
@@ -4260,10 +4259,9 @@ sub action_generate {
     }
 
   } elsif ($what =~ m/^fmtutil$/i) {
-    my $dest = $opts{"dest"} || "$TEXMFSYSVAR/web2c/fmtutil.cnf";
-    my $localcfg = $opts{"localcfg"} || "$TEXMFLOCAL/web2c/fmtutil-local.cnf";
+    my $dest = $opts{"dest"} || "$TEXMFDIST/web2c/fmtutil.cnf";
     debug("$prg: writing new fmtutil.cnf to $dest\n");
-    TeXLive::TLUtils::create_fmtutil($localtlpdb, $dest, $localcfg);
+    TeXLive::TLUtils::create_fmtutil($localtlpdb, $dest);
 
     if ($opts{"rebuild-sys"}) {
       do_cmd_and_check("fmtutil-sys $common_fmtutil_args --all");
@@ -6304,8 +6302,6 @@ Line endings may be either LF or CRLF depending on the current platform.
 
 =item B<generate language.dat.lua>
 
-=item B<generate fmtutil>
-
 =back
 
 The C<generate> action overwrites any manual changes made in the
@@ -6317,36 +6313,39 @@ all of these files.
 For managing your own fonts, please read the C<updmap --help>
 information and/or L<http://tug.org/fonts/fontinstall.html>.
 
+For managing your own formats, please read the C<fmtutil --help>
+information.
+
 In more detail: C<generate> remakes any of the configuration files
-C<language.dat>, C<language.def>, C<language.dat.lua>, and
-C<fmtutil.cnf>, from the information present in the local TLPDB, plus
+C<language.dat>, C<language.def>, and C<language.dat.lua>
+from the information present in the local TLPDB, plus
 locally-maintained files.
 
 The locally-maintained files are C<language-local.dat>,
-C<language-local.def>, C<language-local.dat.lua>, or
-C<fmtutil-local.cnf>, searched for in C<TEXMFLOCAL> in the respective
+C<language-local.def>, or C<language-local.dat.lua>,
+searched for in C<TEXMFLOCAL> in the respective
 directories.  If local additions are present, the final file is made by
 starting with the main file, omitting any entries that the local file
 specifies to be disabled, and finally appending the local file.
 
-(Historical note: The formerly supported C<updmap-local.cfg> is no longer
-read, since C<updmap> now supports multiple C<updmap.cfg> files.  Thus,
-local additions can and should be put into an C<updmap.cfg> file in
-C<TEXMFLOCAL>.  The C<generate updmap> action no longer exists.)
+(Historical note: The formerly supported C<updmap-local.cfg> and
+C<fmtutil-local.cnf> are no longer read, since C<updmap> and C<fmtutil>
+now reads and supports multiple configuration files.  Thus,
+local additions can and should be put into an C<updmap.cfg> of C<fmtutil.cnf>
+file in C<TEXMFLOCAL>.  The C<generate updmap> and C<generate fmtutil> actions
+no longer exist.)
 
 Local files specify entries to be disabled with a comment line, namely
 one of these:
 
-  #!NAME
   %!NAME
   --!NAME
 
-where C<fmtutil.cnf> uses C<#>, C<language.dat> and C<language.def> use
-C<%>, and C<language.dat.lua> use C<-->.  In all cases, the I<name> is
+where C<language.dat> and C<language.def> use C<%>, 
+and C<language.dat.lua> use C<-->.  In all cases, the I<name> is
 the respective format name or hyphenation pattern identifier.
 Examples:
 
-  #!pdflatex
   %!german
   --!usenglishmax
 
@@ -6403,7 +6402,6 @@ The respective locations are as follows:
   tex/generic/config/language.dat (and language-local.dat);
   tex/generic/config/language.def (and language-local.def);
   tex/generic/config/language.dat.lua (and language-local.dat.lua);
-  web2c/fmtutil.cnf (and fmtutil-local.cnf);
 
 
 =head2 gui