summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-12 16:30:18 +0000
committerKarl Berry <karl@freefriends.org>2015-04-12 16:30:18 +0000
commit6a0c9374bb3fb6da6572eca299fa6c3d3e05262b (patch)
treef7643255d9152c7b1c6e5c15c6500419ec69f031 /Build
parent99ebd94045fb45ebcb04f4d78cf78abf75fded8e (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@36792 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm6
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/fmtutil.pl22
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl46
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/updmap.pl10
4 files changed, 42 insertions, 42 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index ab940e6b93e..ca32f0e44dc 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: 35719 $';
+my $svnrev = '$Revision: 35937 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -2032,8 +2032,8 @@ sub add_link_dir_dir {
}
#
# try to make the link.
- if (system ("ln -s '$from/$f' '$to'") != 0) {
- tlwarn ("add_link_dir_dir: linking $f from $from to $to failed: $!\n");
+ if (symlink ("$from/$f", "$to/$f") == 0) {
+ tlwarn ("add_link_dir_dir: symlink of $f from $from to $to failed: $!\n");
$ret = 0;
}
}
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index 63a684d934f..a538567ac6b 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 36561 2015-03-19 14:35:59Z preining $
+# $Id: fmtutil.pl 36788 2015-04-12 15:53:26Z karl $
# fmtutil - utility to maintain format files.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
@@ -33,11 +33,11 @@ BEGIN {
}
-my $svnid = '$Id: fmtutil.pl 36561 2015-03-19 14:35:59Z preining $';
-my $lastchdate = '$Date: 2015-03-19 23:35:59 +0900 (Thu, 19 Mar 2015) $';
+my $svnid = '$Id: fmtutil.pl 36788 2015-04-12 15:53:26Z karl $';
+my $lastchdate = '$Date: 2015-04-12 17:53:26 +0200 (Sun, 12 Apr 2015) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 36561 $';
+my $svnrev = '$Revision: 36788 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "svn$svnrev ($lastchdate)";
@@ -914,12 +914,14 @@ sub determine_config_files {
}
}
if (!$opts{'quiet'}) {
- print "$prg is using the following $fn files (in precedence order):\n";
+ print_verbose("$prg is using the following $fn files"
+ . " (in precedence order):\n");
for my $f (@{$opts{'cnffile'}}) {
- print " $f\n";
+ print_verbose(" $f\n");
}
- print "$prg is using the following $fn file for writing changes:\n";
- print " $changes_config_file\n";
+ print_verbose("$prg is using the following $fn file"
+ . " for writing changes:\n");
+ print_verbose(" $changes_config_file\n");
}
if ($opts{'listfiles'}) {
# we listed it above, so be done
@@ -972,10 +974,10 @@ sub reset_root_home {
#
# printing to stdout (in mktexfmtMode also going to stderr!)
# print_info can be supressed with --quiet
-# print_verbose cannot be supressed
+# print_verbose cannot be suppressed
# printing to stderr
# print_warning can be supressed with --quiet
-# print_error cannot be supressed
+# print_error cannot be suppressed
#
sub print_info {
if ($mktexfmtMode) {
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 673c00c6f33..10dbda74888 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 36352 2015-02-22 13:05:56Z preining $
+# $Id: tlmgr.pl 36770 2015-04-12 02:41:15Z preining $
#
# Copyright 2008-2015 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 36352 $';
-my $datrev = '$Date: 2015-02-22 14:05:56 +0100 (Sun, 22 Feb 2015) $';
+my $svnrev = '$Revision: 36770 $';
+my $datrev = '$Date: 2015-04-12 04:41:15 +0200 (Sun, 12 Apr 2015) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -789,10 +789,9 @@ sub handle_execute_actions {
}
my $opt_fmt = $localtlpdb->option("create_formats");
if ($do_full) {
- info("regenerating fmtutil.cnf in $TEXMFSYSVAR\n");
+ info("regenerating fmtutil.cnf in $TEXMFDIST\n");
TeXLive::TLUtils::create_fmtutil($localtlpdb,
- "$TEXMFSYSVAR/web2c/fmtutil.cnf",
- "$TEXMFLOCAL/web2c/fmtutil-local.cnf");
+ "$TEXMFDIST/web2c/fmtutil.cnf");
}
if ($opt_fmt && !$::regenerate_all_formats) {
# first regenerate all formats --byengine
@@ -4260,10 +4259,9 @@ sub action_generate {
}
} elsif ($what =~ m/^fmtutil$/i) {
- my $dest = $opts{"dest"} || "$TEXMFSYSVAR/web2c/fmtutil.cnf";
- my $localcfg = $opts{"localcfg"} || "$TEXMFLOCAL/web2c/fmtutil-local.cnf";
+ my $dest = $opts{"dest"} || "$TEXMFDIST/web2c/fmtutil.cnf";
debug("$prg: writing new fmtutil.cnf to $dest\n");
- TeXLive::TLUtils::create_fmtutil($localtlpdb, $dest, $localcfg);
+ TeXLive::TLUtils::create_fmtutil($localtlpdb, $dest);
if ($opts{"rebuild-sys"}) {
do_cmd_and_check("fmtutil-sys $common_fmtutil_args --all");
@@ -6304,8 +6302,6 @@ Line endings may be either LF or CRLF depending on the current platform.
=item B<generate language.dat.lua>
-=item B<generate fmtutil>
-
=back
The C<generate> action overwrites any manual changes made in the
@@ -6317,36 +6313,39 @@ all of these files.
For managing your own fonts, please read the C<updmap --help>
information and/or L<http://tug.org/fonts/fontinstall.html>.
+For managing your own formats, please read the C<fmtutil --help>
+information.
+
In more detail: C<generate> remakes any of the configuration files
-C<language.dat>, C<language.def>, C<language.dat.lua>, and
-C<fmtutil.cnf>, from the information present in the local TLPDB, plus
+C<language.dat>, C<language.def>, and C<language.dat.lua>
+from the information present in the local TLPDB, plus
locally-maintained files.
The locally-maintained files are C<language-local.dat>,
-C<language-local.def>, C<language-local.dat.lua>, or
-C<fmtutil-local.cnf>, searched for in C<TEXMFLOCAL> in the respective
+C<language-local.def>, or C<language-local.dat.lua>,
+searched for in C<TEXMFLOCAL> in the respective
directories. If local additions are present, the final file is made by
starting with the main file, omitting any entries that the local file
specifies to be disabled, and finally appending the local file.
-(Historical note: The formerly supported C<updmap-local.cfg> is no longer
-read, since C<updmap> now supports multiple C<updmap.cfg> files. Thus,
-local additions can and should be put into an C<updmap.cfg> file in
-C<TEXMFLOCAL>. The C<generate updmap> action no longer exists.)
+(Historical note: The formerly supported C<updmap-local.cfg> and
+C<fmtutil-local.cnf> are no longer read, since C<updmap> and C<fmtutil>
+now reads and supports multiple configuration files. Thus,
+local additions can and should be put into an C<updmap.cfg> of C<fmtutil.cnf>
+file in C<TEXMFLOCAL>. The C<generate updmap> and C<generate fmtutil> actions
+no longer exist.)
Local files specify entries to be disabled with a comment line, namely
one of these:
- #!NAME
%!NAME
--!NAME
-where C<fmtutil.cnf> uses C<#>, C<language.dat> and C<language.def> use
-C<%>, and C<language.dat.lua> use C<-->. In all cases, the I<name> is
+where C<language.dat> and C<language.def> use C<%>,
+and C<language.dat.lua> use C<-->. In all cases, the I<name> is
the respective format name or hyphenation pattern identifier.
Examples:
- #!pdflatex
%!german
--!usenglishmax
@@ -6403,7 +6402,6 @@ The respective locations are as follows:
tex/generic/config/language.dat (and language-local.dat);
tex/generic/config/language.def (and language-local.def);
tex/generic/config/language.dat.lua (and language-local.dat.lua);
- web2c/fmtutil.cnf (and fmtutil-local.cnf);
=head2 gui
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
index efb27280117..1947dbcb17b 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
@@ -1,9 +1,9 @@
#!/usr/bin/env perl
-# $Id: updmap.pl 36067 2015-01-16 00:02:11Z karl $
+# $Id: updmap.pl 36787 2015-04-12 15:20:30Z karl $
# updmap - maintain map files for outline fonts.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
-# Copyright 2011, 2012, 2013, 2014 Norbert Preining
+# Copyright 2011-2015 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -14,7 +14,7 @@
# the original versions were licensed under the following agreement:
# Anyone may freely use, modify, and/or distribute this file, without
-my $svnid = '$Id: updmap.pl 36067 2015-01-16 00:02:11Z karl $';
+my $svnid = '$Id: updmap.pl 36787 2015-04-12 15:20:30Z karl $';
my $TEXMFROOT;
BEGIN {
@@ -28,10 +28,10 @@ BEGIN {
unshift(@INC, "$TEXMFROOT/tlpkg");
}
-my $lastchdate = '$Date: 2015-01-16 01:02:11 +0100 (Fri, 16 Jan 2015) $';
+my $lastchdate = '$Date: 2015-04-12 17:20:30 +0200 (Sun, 12 Apr 2015) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 36067 $';
+my $svnrev = '$Revision: 36787 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "svn$svnrev ($lastchdate)";