From f1f7280f24a1c09df942f323d1008d631368690b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 29 Apr 2013 23:34:24 +0000 Subject: sync git-svn-id: svn://tug.org/texlive/trunk@30174 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tests/TeXLive/TLUtils.pm | 28 +++++++++++---- .../linked_scripts/glossaries/makeglossaries | 12 +++++-- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 40 +++++++++++++++++----- .../texk/texlive/linked_scripts/texlive/updmap.pl | 10 +++--- Build/source/texk/texlive/tl_scripts/fmtutil.cnf | 27 ++++++++------- 5 files changed, 82 insertions(+), 35 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index b5902c6ed12..fdcd482f5ba 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 29926 $'; +my $svnrev = '$Revision: 30127 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -264,7 +264,7 @@ C as a last resort and hope it provides something useful. sub platform_name { my ($guessed_platform) = @_; - $guessed_platform =~ s/^x86_64-(.*-k?)freebsd/amd64-$1freebsd/; + $guessed_platform =~ s/^x86_64-(.*-k?)(free|net)bsd/amd64-$1$2bsd/; my $CPU; # CPU type as reported by config.guess. my $OS; # O/S type as reported by config.guess. ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/; @@ -327,6 +327,7 @@ sub platform_desc { 'alpha-linux' => 'DEC Alpha with GNU/Linux', 'amd64-freebsd' => 'x86_64 with FreeBSD', 'amd64-kfreebsd' => 'x86_64 with GNU/kFreeBSD', + 'amd64-netbsd' => 'x86_64 with NetBSD', 'armel-linux' => 'ARM with GNU/Linux', 'armhf-linux' => 'ARMhf with GNU/Linux', 'hppa-hpux' => 'HP-UX', @@ -970,8 +971,11 @@ sub touch { if (-e $file) { utime time, time, $file; } else { - open TMP, ">>$file" && close TMP - or warn "Can't update timestamps of $file: $!\n"; + if (open( TMP, ">$file")) { + close(TMP); + } else { + warn "Can't create file $file: $!\n"; + } } } } @@ -2493,6 +2497,8 @@ sub download_file { } else { $url = "$TeXLiveURL/$relpath"; } + + my $wget_retry = 0; if (defined($::tldownload_server) && $::tldownload_server->enabled) { debug("persistent connection set up, trying to get $url (for $dest)\n"); $ret = $::tldownload_server->get_file($url, $dest); @@ -2500,8 +2506,10 @@ sub download_file { debug("downloading file via persistent connection succeeded\n"); return $ret; } else { - tlwarn("tlmgr: persistent connection ok, but download failed: $url\n"); - tlwarn("tlmgr: retrying with wget.\n"); + tlwarn("TLUtils::download_file: persistent connection ok," + . " but download failed: $url\n"); + tlwarn("TLUtils::download_file: retrying with wget.\n"); + $wget_retry = 1; # just so we can give another msg. } } else { if (!defined($::tldownload_server)) { @@ -2511,7 +2519,15 @@ sub download_file { } debug("persistent connection not set up, using wget\n"); } + + # try again. my $ret = _download_file($url, $dest, $wget); + + if ($wget_retry) { + tlwarn("TLUtils::download_file: retry with wget " + . ($ret ? "succeeded" : "failed") . ": $url\n"); + } + return($ret); } diff --git a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries index 3d053fc9553..07ce68bd8d1 100755 --- a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries +++ b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries @@ -2,7 +2,7 @@ # File : makeglossaries # Author : Nicola Talbot -# Version : 2.04 (2011/06/21) +# Version : 2.06 (2013/04/21) # Description: simple Perl script that calls makeindex or xindy. # Intended for use with "glossaries.sty" (saves having to remember # all the various switches) @@ -27,9 +27,11 @@ # glossary-super.sty, glossaries.perl. # Also makeglossaries and makeglossaries. -my $version="2.05 (2012-11-12)"; +my $version="2.06 (2013-04-21)"; # History: +# v2.06 (2013-04-21): +# * added "din5007" as default if language is set to "german" # v2.05 (2012-11-12): # * added -d option # v2.04 (2012-04-19): @@ -677,6 +679,12 @@ sub xindy{ elsif ($language=~/^n?germanb?$/) { $language = "german"; + + # v2.06 added: + if ($codepage and not $codepage=~/(din|duden)/) + { + $codepage = "din5007-$codepage"; + } } elsif ($language eq "magyar") { diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index bc455ee0d9d..2c7520d56c9 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 30095 2013-04-24 23:05:08Z karl $ +# $Id: tlmgr.pl 30121 2013-04-26 06:51:26Z preining $ # # Copyright 2008-2013 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 30095 $'; -my $datrev = '$Date: 2013-04-25 01:05:08 +0200 (Thu, 25 Apr 2013) $'; +my $svnrev = '$Revision: 30121 $'; +my $datrev = '$Date: 2013-04-26 08:51:26 +0200 (Fri, 26 Apr 2013) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -2291,7 +2291,7 @@ sub machine_line { $ret = 1; shift; } - my ($pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag) = @_; + my ($pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag, $lcv, $rcv) = @_; $lrev ||= "-"; $rrev ||= "-"; $flag ||= "?"; @@ -2299,7 +2299,9 @@ sub machine_line { $runtime ||= "-"; $esttot ||= "-"; $tag ||= "-"; - my $str = join("\t", $pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag); + $lcv ||= "-"; + $rcv ||= "-"; + my $str = join("\t", $pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag, $lcv, $rcv); $str .= "\n"; return($str) if $ret; print $str; @@ -2550,7 +2552,8 @@ sub action_update { if ($::machinereadable) { # TODO should we add a revision number push @addlines, - machine_line("-ret", $pkg, $FLAG_FORCIBLE_REMOVED, "-", "-", "-"); + # $pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag, $lcv, $rcv + machine_line("-ret", $pkg, $FLAG_FORCIBLE_REMOVED); } else { info("skipping forcibly removed package $pkg\n"); } @@ -2580,6 +2583,7 @@ sub action_update { next; } my $rev = $tlp->revision; + my $lctanvers = $tlp->cataloguedata->{'version'}; my $mediatlp; my $maxtag; if ($remotetlpdb->is_virtual) { @@ -2592,19 +2596,24 @@ sub action_update { debug("$pkg cannot be found in $location\n"); next; } + my $rctanvers = $mediatlp->cataloguedata->{'version'}; my $mediarev = $mediatlp->revision; my $mediarevstr = $mediarev; my @addargs = (); if ($remotetlpdb->is_virtual) { push @addargs, $maxtag; $mediarevstr .= "\@$maxtag"; + } else { + push @addargs, undef; } + push @addargs, $lctanvers, $rctanvers; if ($rev < $mediarev) { $updated{$pkg} = 0; # will be changed to one on successful update } elsif ($rev > $mediarev) { if ($::machinereadable) { + # $pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag, $lcv, $rcv push @addlines, - machine_line("-ret", $pkg, $FLAG_REVERSED_UPDATE, $rev, $mediarev, "-", @addargs); + machine_line("-ret", $pkg, $FLAG_REVERSED_UPDATE, $rev, $mediarev, "-", "-", "-", @addargs); } else { if ($opts{"list"}) { # not issueing anything if we keep a package @@ -2738,9 +2747,11 @@ sub action_update { next; } my $rev = $pkg->revision; + my $lctanvers = $pkg->cataloguedata->{'version'}; if ($opts{"list"}) { if ($::machinereadable) { - machine_line($p, $FLAG_REMOVE, $rev, "-", "-", "-"); + # $pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag, $lcv, $rcv + machine_line($p, $FLAG_REMOVE, $rev, "-", "-", "-", "-", "-", $lctanvers); } else { upd_info($p, -1, $rev, "", "autorm"); } @@ -2752,7 +2763,8 @@ sub action_update { # we have to check in addition that # - $opts{"dry-run"} is not set if ($::machinereadable) { - machine_line($p, $FLAG_REMOVE, $rev, "-", "-", "-"); + # $pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag, $lcv, $rcv + machine_line($p, $FLAG_REMOVE, $rev, "-", "-", "-", "-", "-", $lctanvers); } else { info("[" . sprintf ('%*2$s', $currnr, $totalnrdigits) . "/$totalnr] auto-remove: $p ... "); @@ -2865,6 +2877,7 @@ sub action_update { my $unwind_package; my $remove_unwind_container = 0; my $rev = $tlp->revision; + my $lctanvers = $tlp->cataloguedata->{'version'}; my $mediatlp; my $maxtag; if ($remotetlpdb->is_virtual) { @@ -2877,16 +2890,21 @@ sub action_update { debug("$pkg cannot be found in $location\n"); next; } + my $rctanvers = $mediatlp->cataloguedata->{'version'}; my $mediarev = $mediatlp->revision; my $mediarevstr = $mediarev; my @addargs = (); if ($remotetlpdb->is_virtual) { push @addargs, $maxtag; $mediarevstr .= "\@$maxtag"; + } else { + push @addargs, undef; } + push @addargs, $lctanvers, $rctanvers; $nrupdated++; if ($opts{"list"}) { if ($::machinereadable) { + # $pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag, $lcv, $rcv machine_line($pkg, $FLAG_UPDATE, $rev, $mediarev, $sizes{$pkg}, "-", "-", @addargs); } else { my $kb = int($sizes{$pkg} / 1024) + 1; @@ -3420,6 +3438,7 @@ sub action_install { my $flag = $FLAG_INSTALL; my $re = ""; my $tlp = $remotetlpdb->get_package($pkg); + my $rctanvers = $tlp->cataloguedata->{'version'}; if (!defined($tlp)) { info("Unknown package $pkg\n"); next; @@ -3428,7 +3447,9 @@ sub action_install { info("Package $pkg is not relocatable, cannot install it in user mode!\n"); next; } + my $lctanvers; if (defined($localtlpdb->get_package($pkg))) { + my $lctanvers = $localtlpdb->get_package($pkg)->cataloguedata->{'version'}; if ($opts{"reinstall"}) { $re = "re"; $flag = $FLAG_REINSTALL; @@ -3452,6 +3473,7 @@ sub action_install { $tagstr = " \@" . $maxtag; } } + push @addargs, $lctanvers, $rctanvers; if ($::machinereadable) { machine_line($pkg, $flag, "-", $revs{$pkg}, $sizes{$pkg}, $estrem, $esttot, @addargs); } else { diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl index abf4e4b085a..4444a177f2a 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: updmap.pl 30043 2013-04-19 19:47:12Z preining $ +# $Id: updmap.pl 30150 2013-04-28 23:33:28Z karl $ # updmap - maintain map files for outline fonts. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) # @@ -34,7 +34,7 @@ BEGIN { } -my $version = '$Id: updmap.pl 30043 2013-04-19 19:47:12Z preining $'; +my $version = '$Id: updmap.pl 30150 2013-04-28 23:33:28Z karl $'; use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; @@ -343,6 +343,9 @@ sub main { $bakFile =~ s/\.cfg$/.bak/; my $changed = 0; + $updLSR = &mktexupd(); + $updLSR->{mustexist}(0); + if ($opts{'syncwithtrees'}) { merge_settings_replace_kanji(); my @missing = read_map_files(); @@ -370,9 +373,6 @@ sub main { exit 0; } - $updLSR = &mktexupd(); - $updLSR->{mustexist}(0); - my $cmd; if ($opts{'edit'}) { if ($opts{"dry-run"}) { diff --git a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf index 8e1ab82149f..e6dab71afee 100644 --- a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf +++ b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf @@ -1,5 +1,4 @@ -# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Mon May 14 04:46:13 2012 -# $Id: fmtutil-hdr.cnf 13067 2009-05-12 22:04:17Z preining $ +# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Mon Apr 8 21:17:02 2013 # Originally written by Thomas Esser, 1998. Public domain. # # As of TeX Live 2008, the final fmtutil.cnf is generated by @@ -43,21 +42,23 @@ lamed aleph language.dat *lambda.ini amstex pdftex - -translate-file=cp227.tcx *amstex.ini # # from context: -cont-en pdftex cont-usr.tex -8bit *cont-en.ini -cont-en xetex cont-usr.tex -8bit *cont-en.ini -#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini -#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini -#! cont-it pdftex cont-usr.tex -8bit *cont-it.ini -#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini -#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini +cont-en pdftex cont-usr.tex -8bit *cont-en.mkii +cont-en xetex cont-usr.tex -8bit *cont-en.mkii +#! cont-de pdftex cont-usr.tex -8bit *cont-de.mkii +#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii +#! cont-it pdftex cont-usr.tex -8bit *cont-it.mkii +#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii +#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii # # from cslatex: -cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini -pdfcslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini +cslatex pdftex - -etex cslatex.ini +pdfcslatex pdftex - -etex cslatex.ini # # from csplain: -csplain pdftex - -etex -translate-file=cp227.tcx csplain.ini -pdfcsplain pdftex - -etex -translate-file=cp227.tcx csplain.ini +csplain pdftex - -etex -enc csplain-utf8.ini +pdfcsplain pdftex - -etex -enc csplain-utf8.ini +#! pdfcsplain xetex - -etex csplain.ini +#! pdfcsplain luatex - -etex csplain.ini # # from eplain: eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini -- cgit v1.2.3