diff options
| -rwxr-xr-x | Build/source/build-aux/missing | 2 | ||||
| -rwxr-xr-x | Build/source/build-aux/ylwrap | 2 | ||||
| -rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 27 | ||||
| -rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl | 11 | ||||
| -rw-r--r-- | Build/source/texk/texlive/tl_scripts/fmtutil.cnf | 13 | ||||
| -rw-r--r-- | Master/texmf-dist/scripts/texlive/NEWS | 6 |
6 files changed, 32 insertions, 29 deletions
diff --git a/Build/source/build-aux/missing b/Build/source/build-aux/missing index db98974ff5d..f62bbae306c 100755 --- a/Build/source/build-aux/missing +++ b/Build/source/build-aux/missing @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff --git a/Build/source/build-aux/ylwrap b/Build/source/build-aux/ylwrap index 8f072a8e97c..7c2d927f7f6 100755 --- a/Build/source/build-aux/ylwrap +++ b/Build/source/build-aux/ylwrap @@ -3,7 +3,7 @@ scriptversion=2013-01-12.17; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # Written by Tom Tromey <tromey@cygnus.com>. # diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index 7b116558671..8763d3dbf6a 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: 36787 $'; +my $svnrev = '$Revision: 36818 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -69,8 +69,8 @@ C<TeXLive::TLUtils> -- utilities used in the TeX Live infrastructure TeXLive::TLUtils::make_var_skeleton($path); TeXLive::TLUtils::make_local_skeleton($path); - TeXLive::TLUtils::create_fmtutil($tlpdb,$dest,$localconf); - TeXLive::TLUtils::create_updmap($tlpdb,$dest,$localconf); + TeXLive::TLUtils::create_fmtutil($tlpdb,$dest); + TeXLive::TLUtils::create_updmap($tlpdb,$dest); TeXLive::TLUtils::create_language_dat($tlpdb,$dest,$localconf); TeXLive::TLUtils::create_language_def($tlpdb,$dest,$localconf); TeXLive::TLUtils::create_language_lua($tlpdb,$dest,$localconf); @@ -2763,9 +2763,9 @@ sub make_local_skeleton { } -=item C<create_fmtutil($tlpdb, $dest, $localconf)> +=item C<create_fmtutil($tlpdb, $dest)> -=item C<create_updmap($tlpdb, $dest, $localconf)> +=item C<create_updmap($tlpdb, $dest)> =item C<create_language_dat($tlpdb, $dest, $localconf)> @@ -2799,22 +2799,21 @@ sub get_disabled_local_configs { my $localconf = shift; my $cc = shift; my @disabled = (); - if (-r "$localconf") { - open FOO, "<$localconf" - or die "strange, -r ok but cannot open $localconf: $!"; + if ($localconf && -r $localconf) { + open (FOO, "<$localconf") + || die "strange, -r ok but open($localconf) failed: $!"; my @tmp = <FOO>; - close(FOO) || warn("Closing $localconf did not succeed: $!"); - @disabled = map { if (m/^$cc!(\S+)\s*$/) { $1 } else { }} @tmp; + close(FOO) || warn("close($localconf) failed: $!"); + @disabled = map { if (m/^$cc!(\S+)\s*$/) { $1 } else { } } @tmp; } return @disabled; } sub create_fmtutil { - my ($tlpdb,$dest,$localconf) = @_; - my @lines = $tlpdb->fmtutil_cnf_lines( - get_disabled_local_configs($localconf, '#')); + my ($tlpdb,$dest) = @_; + my @lines = $tlpdb->fmtutil_cnf_lines(); _create_config_files($tlpdb, "texmf-dist/web2c/fmtutil-hdr.cnf", $dest, - $localconf, 0, '#', \@lines); + undef, 0, '#', \@lines); } sub create_updmap { diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl index 9c47fcaf283..0ef264c2ac7 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: fmtutil.pl 37175 2015-05-04 02:00:42Z preining $ +# $Id: fmtutil.pl 37190 2015-05-04 23:36:23Z karl $ # fmtutil - utility to maintain format files. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) # @@ -26,11 +26,11 @@ BEGIN { } -my $svnid = '$Id: fmtutil.pl 37175 2015-05-04 02:00:42Z preining $'; -my $lastchdate = '$Date: 2015-05-04 04:00:42 +0200 (Mon, 04 May 2015) $'; +my $svnid = '$Id: fmtutil.pl 37190 2015-05-04 23:36:23Z karl $'; +my $lastchdate = '$Date: 2015-05-05 01:36:23 +0200 (Tue, 05 May 2015) $'; $lastchdate =~ s/^\$Date:\s*//; $lastchdate =~ s/ \(.*$//; -my $svnrev = '$Revision: 37175 $'; +my $svnrev = '$Revision: 37190 $'; $svnrev =~ s/^\$Revision:\s*//; $svnrev =~ s/\s*\$$//; my $version = "r$svnrev ($lastchdate)"; @@ -756,7 +756,8 @@ sub read_fmtutil_file { next if /^\s*#?\s*$/; # ignore empty and all-blank and just-# lines next if /^\s*#[^!]/; # ignore whole-line comment that is not a disable s/#[^!].*//; # remove within-line comment that is not a disable - my ($a, $b, $c, @rest) = split ' '; # special split rule, leading ws ign + s/#$//; # remove # at end of line + my ($a,$b,$c,@rest) = split (' '); # special split rule, leading ws ign my $disabled = 0; if ($a eq "#!") { # we cannot determine whether a line is a proper fmtline or diff --git a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf index c565b3ac275..d2bd6daf3ad 100644 --- a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf +++ b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf @@ -1,11 +1,12 @@ -# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Fri Apr 25 03:23:27 2014 -# $Id: fmtutil-hdr.cnf 30214 2013-05-02 22:31:16Z karl $ +# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue May 5 03:20:22 2015 # Originally written by Thomas Esser, 1998. Public domain. # -# As of TeX Live 2008, the final fmtutil.cnf is generated by -# tlmgr generate fmtutil. You can use -# tlmgr generate fmtutil -localcfg /some/file to make local additions. -# See tlmgr --help for more info. +# As of TeX Live 2015, fmtutil reads *all* fmtutil.cnf files found. +# Consequently, any manual edits of this file (fmtutil.cnf in the +# TEXMFDIST tree) will be lost on update. So don't do that. +# +# For guidance on how to achieve local configurations, see the man +# page of fmtutil, or the output of fmtutil --help. # # The format of the table is: # diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS index 2e1e57507bc..8f2d31eba0e 100644 --- a/Master/texmf-dist/scripts/texlive/NEWS +++ b/Master/texmf-dist/scripts/texlive/NEWS @@ -1,11 +1,13 @@ (This file public domain. Originally written by Norbert Preining and Karl Berry, 2010.) +<p><b>tlmgr revision 37030 (released 24apr15):</b> +<li>more reliable exit status codes. <li>add --with-doc and --with-src options for use with install --reinstall, to get the doc and/or src files even if they were omitted at initial installation. -<li>install action reports explicitly-requested packages already installed. -<li>make restore --dry-run more of a no-op, as intended. +<li>the install action reports explicitly-requested packages already installed. +<li>restore --dry-run is now more of a no-op, as intended. <p><b>tlmgr revision 35841 (released 24dec14):</b> <li>remove taxonomy searching, since upstream data is no longer maintained. |