diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-05-16 09:11:43 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-05-16 09:11:43 +0000 |
commit | 80dc85bba20b352c11ead7a55b782d65ef2d4033 (patch) | |
tree | 983cd4d77523c656629d68436dd2381c82a60180 /Build/source/texk/tests/TeXLive | |
parent | c498c9b8f5a47cd3edccde95bdc9b83545ed4247 (diff) |
Sync Master => Build
git-svn-id: svn://tug.org/texlive/trunk@34058 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/tests/TeXLive')
-rw-r--r-- | Build/source/texk/tests/TeXLive/TLConfig.pm | 5 | ||||
-rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm index 840d5f78be2..4e0855319b8 100644 --- a/Build/source/texk/tests/TeXLive/TLConfig.pm +++ b/Build/source/texk/tests/TeXLive/TLConfig.pm @@ -1,3 +1,4 @@ +# $Id: TLConfig.pm 34040 2014-05-15 12:16:59Z siepo $ # TeXLive::TLConfig.pm - module exporting configuration values # Copyright 2007-2014 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -5,7 +6,7 @@ package TeXLive::TLConfig; -my $svnrev = '$Revision: 33571 $'; +my $svnrev = '$Revision: 34040 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -175,7 +176,7 @@ our %TLPDBOptions = ( [ "p", "/usr/local/share/man", "sys_man", "Destination for symlinks for man pages" ], "w32_multi_user" => - [ "b", 0, "multiuser", + [ "b", 1, "multiuser", "Install for all users (w32)" ], "generate_updmap" => [ "b", 0, "generate_updmap", diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index cc3735299f3..06da8ce60f4 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -1,3 +1,4 @@ +# $Id: TLUtils.pm 34057 2014-05-16 05:25:02Z preining $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. # Copyright 2007-2014 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 @@ -5,7 +6,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 33564 $'; +my $svnrev = '$Revision: 34057 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -200,7 +201,6 @@ use Cwd; use Digest::MD5; use Getopt::Long; use File::Temp; -use Time::HiRes; use TeXLive::TLConfig; @@ -1410,7 +1410,7 @@ sub install_packages { # The open might fail for no good reason on Windows. # Try again for a while, but not forever. if ($count++ == 100) { die "$0: open($tlpobj_file) failed: $!"; } - Time::HiRes::sleep(0.01); # sleep briefly + select (undef, undef, undef, .1); # sleep briefly } $tlpobj->writeout(\*TMP); close(TMP); @@ -2688,7 +2688,7 @@ sub make_var_skeleton { my ($prefix) = @_; mkdirhier "$prefix/tex/generic/config"; - mkdirhier "$prefix/fonts/map/dvipdfm/updmap"; + mkdirhier "$prefix/fonts/map/dvipdfmx/updmap"; mkdirhier "$prefix/fonts/map/dvips/updmap"; mkdirhier "$prefix/fonts/map/pdftex/updmap"; mkdirhier "$prefix/fonts/pk"; |