summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-12 17:52:34 +0000
committerKarl Berry <karl@freefriends.org>2015-04-12 17:52:34 +0000
commita3692c4e3bb7ade34c064ce15e23de14e339ef2e (patch)
treec0cc4ce3e7f6b7632be0336007cee252a0ca0445
parent476a19e38e9ef3021e99243fd1d30b51ba03e6c3 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@36802 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tests/TeXLive/TLConfig.pm8
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm4
-rwxr-xr-xBuild/source/texk/texlive/w32_wrapper/runscript.tlu14
3 files changed, 17 insertions, 9 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm
index 573efa08d56..1a4424c8e82 100644
--- a/Build/source/texk/tests/TeXLive/TLConfig.pm
+++ b/Build/source/texk/tests/TeXLive/TLConfig.pm
@@ -1,11 +1,11 @@
# TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007-2014 Norbert Preining
+# Copyright 2007-2015 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 35731 $';
+my $svnrev = '$Revision: 36787 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -54,11 +54,11 @@ BEGIN {
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
-$ReleaseYear = 2014;
+$ReleaseYear = 2015;
# users can upgrade from this year to the current year; maybe a spread
# of more than one year will be useful at some point, but not now.
-$MinRelease = 2013; # upgrade from 2013 to 2015 might work?
+$MinRelease = 2013; # upgrade from 2013 to 2015 should work, we'll see
# users can NOT upgrade due to internal changes, force a full installation
#$MinRelease = $ReleaseYear;
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index ca32f0e44dc..7b116558671 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,11 +1,11 @@
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2014 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2015 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 35937 $';
+my $svnrev = '$Revision: 36787 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
index daa1d4f6d6f..0a4ff2bb3bf 100755
--- a/Build/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 33766 $", "%d+") or "0"
-local svndate = string.match("$Date: 2014-04-30 18:03:08 +0200 (Wed, 30 Apr 2014) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 36770 $", "%d+") or "0"
+local svndate = string.match("$Date: 2015-04-12 04:41:15 +0200 (Sun, 12 Apr 2015) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
@@ -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')