diff options
| author | Norbert Preining <preining@logic.at> | 2015-03-19 14:35:59 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2015-03-19 14:35:59 +0000 |
| commit | 193877f304af57c40d263cf20d8b587175dd4959 (patch) | |
| tree | ca3b99cf7fb5bbd872088adccf238f1813be9353 | |
| parent | 7ee6847917bff2a1aa2efe598f3524a00c3ed3c5 (diff) | |
fix fmtutil.pl for Windows
git-svn-id: svn://tug.org/texlive/trunk@36561 c570f23f-e606-0410-a88d-b1316a301751
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/fmtutil.pl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/texlive/fmtutil.pl b/Master/texmf-dist/scripts/texlive/fmtutil.pl index f7323d1601f..a5582e42b5f 100755 --- a/Master/texmf-dist/scripts/texlive/fmtutil.pl +++ b/Master/texmf-dist/scripts/texlive/fmtutil.pl @@ -9,6 +9,13 @@ # # History: # Original shell script (C) 2001 Thomas Esser, public domain +# +# TODO +# not really here: +# in main texlive, we need to ensure that the texmf-dist/web2c/fmtutil.cnf +# file consists only of those formats that are actually installed, +# NOT as of now of all!! +# We are reading ALL fmtutil.cnf now! my $TEXMFROOT; @@ -61,6 +68,7 @@ my $FMT_SUCCESS = 3; my $FMT_NOTAVAIL = 4; my $nul = (win32() ? 'nul' : '/dev/null'); +my $sep = (win32() ? ';' : ':'); my @deferred_stderr; my @deferred_stdout; @@ -305,11 +313,11 @@ sub callback_build_formats { # due to KPSE_DOT, we don't search the current directory, so include # it explicitly for formats that \write and later on \read - $ENV{'TEXINPUTS'} = "$tmpdir:" . ($ENV{'TEXINPUTS'} ? $ENV{'TEXINPUTS'} : ""); + $ENV{'TEXINPUTS'} = "$tmpdir$sep" . ($ENV{'TEXINPUTS'} ? $ENV{'TEXINPUTS'} : ""); # for formats that load other formats (e.g., jadetex loads latex.fmt), # add the current directory to TEXFORMATS, too. Currently unnecessary # for MFBASES and MPMEMS. - $ENV{'TEXFORMATS'} = "$tmpdir:" . ($ENV{'TEXFORMATS'} ? $ENV{'TEXFORMATS'} : ""); + $ENV{'TEXFORMATS'} = "$tmpdir$sep" . ($ENV{'TEXFORMATS'} ? $ENV{'TEXFORMATS'} : ""); # # switch to temporary directory for format generation @@ -500,7 +508,7 @@ sub rebuild_one_format { { my $texpool = $ENV{'TEXPOOL'}; if ($localpool) { - $ENV{'TEXPOOL'} = cwd() . ":" . ($texpool ? $texpool : ""); + $ENV{'TEXPOOL'} = cwd() . $sep . ($texpool ? $texpool : ""); } # in mktexfmtMode we need to redirect *all* output to stderr |