summaryrefslogtreecommitdiff
path: root/Master/bin
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2015-04-12 02:41:15 +0000
committerNorbert Preining <preining@logic.at>2015-04-12 02:41:15 +0000
commitd1c10b0e8ae31a25adc6ad5fb8377534d4acc6a4 (patch)
treec7244ee1b0e8a7850cabb095d30fea8e1d974494 /Master/bin
parente371ee1a28d1e74fb8419798c0c0b78b7e7d3a20 (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')
l---------Master/bin/alpha-linux/fmtutil2
l---------Master/bin/amd64-freebsd/fmtutil2
l---------Master/bin/amd64-netbsd/fmtutil2
l---------Master/bin/armel-linux/fmtutil2
l---------Master/bin/armhf-linux/fmtutil2
l---------Master/bin/i386-cygwin/fmtutil2
l---------Master/bin/i386-freebsd/fmtutil2
l---------Master/bin/i386-linux/fmtutil2
l---------Master/bin/i386-netbsd/fmtutil2
l---------Master/bin/i386-solaris/fmtutil2
l---------Master/bin/mipsel-linux/fmtutil2
l---------Master/bin/powerpc-linux/fmtutil2
l---------Master/bin/sparc-solaris/fmtutil2
l---------Master/bin/universal-darwin/fmtutil2
-rwxr-xr-xMaster/bin/win32/fmtutil.exebin24064 -> 1536 bytes
-rwxr-xr-xMaster/bin/win32/runscript.tlu10
l---------Master/bin/x86_64-cygwin/fmtutil2
l---------Master/bin/x86_64-darwin/fmtutil2
l---------Master/bin/x86_64-linux/fmtutil2
l---------Master/bin/x86_64-solaris/fmtutil2
20 files changed, 27 insertions, 19 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
Binary files differ
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