diff options
author | Norbert Preining <preining@logic.at> | 2015-04-12 02:41:15 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2015-04-12 02:41:15 +0000 |
commit | d1c10b0e8ae31a25adc6ad5fb8377534d4acc6a4 (patch) | |
tree | c7244ee1b0e8a7850cabb095d30fea8e1d974494 /Master/bin/win32 | |
parent | e371ee1a28d1e74fb8419798c0c0b78b7e7d3a20 (diff) |
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
Diffstat (limited to 'Master/bin/win32')
-rwxr-xr-x | Master/bin/win32/fmtutil.exe | bin | 24064 -> 1536 bytes | |||
-rwxr-xr-x | Master/bin/win32/runscript.tlu | 10 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Master/bin/win32/fmtutil.exe b/Master/bin/win32/fmtutil.exe Binary files differindex 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')
|