texlive[44109] trunk: doc,sync,binary locations
commits+karl at tug.org
commits+karl at tug.org
Sat Apr 29 01:12:12 CEST 2017
Revision: 44109
http://tug.org/svn/texlive?view=revision&revision=44109
Author: karl
Date: 2017-04-29 01:12:11 +0200 (Sat, 29 Apr 2017)
Log Message:
-----------
doc,sync,binary locations
Modified Paths:
--------------
trunk/Build/source/texk/tests/TeXLive/TLConfig.pm
trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
trunk/Master/tlpkg/bin/tl-update-bindir
trunk/Master/tlpkg/bin/tlpsizes
Modified: trunk/Build/source/texk/tests/TeXLive/TLConfig.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLConfig.pm 2017-04-28 23:01:00 UTC (rev 44108)
+++ trunk/Build/source/texk/tests/TeXLive/TLConfig.pm 2017-04-28 23:12:11 UTC (rev 44109)
@@ -5,7 +5,7 @@
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 43872 $';
+my $svnrev = '$Revision: 44018 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -148,6 +148,9 @@
"file_assocs" =>
[ "n:0..2", 1, "fileassocs",
"Change file associations (w32)" ],
+ "generate_updmap" =>
+ [ "b", 0, "generate_updmap",
+ "Run tlmgr generate updmap after maps have changed" ],
"install_docfiles" =>
[ "b", 1, "docfiles",
"Install documentation files" ],
@@ -172,9 +175,6 @@
"w32_multi_user" =>
[ "b", 1, "multiuser",
"Install for all users (w32)" ],
- "generate_updmap" =>
- [ "b", 0, "generate_updmap",
- "Run tlmgr generate updmap after maps have changed" ],
);
Modified: trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLUtils.pm 2017-04-28 23:01:00 UTC (rev 44108)
+++ trunk/Build/source/texk/tests/TeXLive/TLUtils.pm 2017-04-28 23:12:11 UTC (rev 44109)
@@ -5,7 +5,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 43903 $';
+my $svnrev = '$Revision: 43973 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -1664,12 +1664,12 @@
$cmd =~ s!^TEXDIR/!$texdir/!;
# $cmd can be an URL, in which case we do NOT want to convert it to
# w32 paths!
- if ($cmd !~ m!^\s*(http://|ftp://)!) {
+ if ($cmd !~ m!^\s*(https?://|ftp://)!) {
if (!(-e $cmd) or !(-r $cmd)) {
tlwarn("Target of shortcut action does not exist: $cmd\n")
if $cmd =~ /\.(exe|bat|cmd)$/i;
- # if not an executable, just omit shortcut silently
- return 0;
+ # if not an executable, just omit shortcut silently: no error
+ return 1;
}
$cmd = conv_to_w32_path($cmd);
}
@@ -2083,7 +2083,7 @@
$xzfile_quote = "\"$xzfile\"";
$tarfile_quote = "\"$tarfile\"";
$target_quote = "\"$target\"";
- if ($what =~ m,^(http|ftp)://,) {
+ if ($what =~ m,^(https?|ftp)://,) {
# we are installing from the NET
# check for the presence of $what in $tempdir
if (-r $xzfile) {
@@ -2441,7 +2441,7 @@
return 0;
}
}
- if ($relpath =~ /^(http|ftp):\/\//) {
+ if ($relpath =~ /^(https?|ftp):\/\//) {
$url = $relpath;
} else {
$url = "$TeXLiveURL/$relpath";
@@ -3551,7 +3551,7 @@
return $backbone[int(rand($#backbone + 1))];
}
- if ($mirror =~ m!^http://!) { # if http mirror, assume good and return.
+ if ($mirror =~ m!^https?://!) { # if http mirror, assume good and return.
return $mirror;
}
@@ -3566,7 +3566,7 @@
for (my $try = 1; $try <= $max_mirror_trial; $try++) {
my $m = query_ctan_mirror();
debug("querying mirror, got " . (defined($m) ? $m : "(nothing)") . "\n");
- if (defined($m) && $m =~ m!^http://!) {
+ if (defined($m) && $m =~ m!^https?://!) {
return $m; # got http this time, assume ok.
}
# sleep to make mirror happy, but only if we are not ready to return
@@ -3669,7 +3669,7 @@
sub download_to_temp_or_file {
my $url = shift;
my ($url_fh, $url_file);
- if ($url =~ m,^(http|ftp|file)://,) {
+ if ($url =~ m,^(https?|ftp|file)://,) {
($url_fh, $url_file) = tl_tmpfile();
# now $url_fh filehandle is open, the file created
# TLUtils::download_file will just overwrite what is there
Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl 2017-04-28 23:01:00 UTC (rev 44108)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl 2017-04-28 23:12:11 UTC (rev 44109)
@@ -4349,7 +4349,7 @@
}
}
print "Already installed platforms are marked with (i)\n";
- print "You can add new platforms with: tlmgr platform add ARCH1 ARCH2...\n";
+ print "You can add new platforms with: tlmgr platform add PLAT1 PLAT2...\n";
return ($F_OK | $F_NOPOSTACTION);
} elsif ($what =~ m/^add$/i) {
return ($F_ERROR) if !check_on_writable();
@@ -5562,7 +5562,7 @@
}
return($F_OK);
} else {
- print "No auxilary texmf trees defined.\n";
+ print "No auxiliary texmf trees defined.\n";
return($F_OK);
}
} elsif ($val eq "add") {
@@ -5614,11 +5614,11 @@
$cf->delete_key($tmfa);
}
} else {
- print ("argument `$str' not defined as auxilary texmf tree\n");
+ print ("Not defined as auxiliary texmf tree: $str\n");
return($F_WARNING);
}
} else {
- print "No auxilary texmf trees defined, nothing removed\n";
+ print "No auxiliary texmf trees defined, nothing removed\n";
return($F_WARNING);
}
} else {
@@ -5636,7 +5636,8 @@
} elsif (!defined($val)) {
if (defined($opts{'delete'})) {
if (defined($cf->value($key))) {
- info("removing setting $arg $key value: " . $cf->value($key) . "from $fn\n");
+ info("removing setting $arg $key value: " . $cf->value($key)
+ . "from $fn\n");
$cf->delete_key($key);
} else {
info("$arg $key not defined, cannot remove ($fn)\n");
@@ -7118,13 +7119,12 @@
With only C<conf>, show general configuration information for TeX Live,
including active configuration files, path settings, and more. This is
-like the C<texconfig conf> call, but works on all supported platforms.
+like running C<texconfig conf>, but works on all supported platforms.
-With either C<conf texmf>, C<conf tlmgr>, or C<conf updmap> given in
-addition, shows all key/value pairs (i.e., all settings) as saved in
-C<ROOT/texmf.cnf>, the user-specific C<tlmgr> configuration file (see
-below), or the first found (via C<kpsewhich>) C<updmap.cfg> file,
-respectively.
+With one of C<conf texmf>, C<conf tlmgr>, or C<conf updmap>, shows all
+key/value pairs (i.e., all settings) as saved in C<ROOT/texmf.cnf>, the
+user-specific C<tlmgr> configuration file (see below), or the first
+found (via C<kpsewhich>) C<updmap.cfg> file, respectively.
If I<key> is given in addition, shows the value of only that I<key> in
the respective file. If option I<--delete> is also given, the value in
@@ -7134,34 +7134,33 @@
If I<value> is given in addition, I<key> is set to I<value> in the
respective file. I<No error checking is done!>
-For C<texmf> there is a special key C<auxtrees> which allows adding
-and removing auxilary texmf trees. C<auxtrees show> shows the list
-of additional trees, C<texmf add> I<tree> adds a tree to the list,
-and C<auxtrees remove> I<tree> removes a tree from the list (if present).
+Here is a practical example of changing configuration values. If the
+execution of (some or all) system commands via C<\write18> was left
+enabled during installation, you can disable it afterwards:
+
+ tlmgr conf texmf shell_escape 0
-In all cases the file used can be explicitly specified via the option
-C<--conffile I<file>>, in case one wants to operate on a different file.
+For C<texmf>, an additional subcommand C<auxtrees> allows adding and
+removing arbitrary additional texmf trees, completely under user
+control. C<texmf auxtrees show> shows the list of additional trees,
+C<texmf auxtrees add> I<tree> adds a tree to the list, and C<texmf
+auxtrees remove> I<tree> removes a tree from the list (if present). This
+works by manipulating the Kpathsea variable C<TEXMFAUXTREES>, in
+C<ROOT/texmf.cnf>. Example:
-The PATH value shown is that used by C<tlmgr>. The directory in which
+ tlmgr conf texmf auxtrees add /my/quick/test/tree
+ tlmgr conf texmf auxtrees remove /my/quick/test/tree
+
+In all cases the configuration file can be explicitly specified via the
+option C<--conffile> I<file>, if desired.
+
+The C<PATH> value shown is as used by C<tlmgr>. The directory in which
the C<tlmgr> executable is found is automatically prepended to the PATH
value inherited from the environment.
-Practical example of changing configuration values: if the execution of
-(some or all) system commands via C<\write18> was left enabled during
-installation, you can disable it afterwards:
-
- tlmgr conf texmf shell_escape 0
-
-A more complicated example: the C<TEXMFHOME> tree (see the main TeX Live
-guide, L<http://tug.org/texlive/doc.html>) can be set to multiple
-directories, but they must be enclosed in braces and separated by
-commas, so quoting the value to the shell is a good idea. Thus:
-
- tlmgr conf texmf TEXMFHOME "{~/texmf,~/texmfbis}"
-
Warning: The general facility is here, but tinkering with settings in
-this way is very strongly discouraged. Again, no error checking on
-either keys or values is done, so any sort of breakage is possible.
+this way is strongly discouraged. Again, no error checking on either
+keys or values is done, so any sort of breakage is possible.
=head2 dump-tlpdb [--local|--remote]
Modified: trunk/Master/tlpkg/bin/tl-update-bindir
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-bindir 2017-04-28 23:01:00 UTC (rev 44108)
+++ trunk/Master/tlpkg/bin/tl-update-bindir 2017-04-28 23:12:11 UTC (rev 44109)
@@ -49,7 +49,7 @@
bin_loc=
download=wget
msg=echo
-tlnames=
+tlplats=
while test $# -gt 0; do
case $1 in
--help|-help|-v) echo "$usage"; exit 0;;
@@ -64,12 +64,12 @@
--*) echo "$0: unrecognized option \`$1'; try --help if you need it." >&2
exit 1;;
- *) tlnames="$tlnames $1";;
+ *) tlplats="$tlplats $1";;
esac
shift
done
-if test -z "$tlnames"; then
+if test -z "$tlplats"; then
echo "$0: missing TL platform name; try --help if you need it." >&2
exit 1
fi
@@ -84,10 +84,10 @@
fi
# loop through tl platform names
-for tlname in $tlnames; do
- destdir=$Master/bin/$tlname
+for tlplat in $tlplats; do
+ destdir=$Master/bin/$tlplat
if test ! -d $destdir; then
- echo "$0: unrecognized platform name \`$tlname'" >&2
+ echo "$0: unrecognized platform name \`$tlplat'" >&2
echo "$0: (no directory $destdir)" >&2
exit 1
fi
@@ -94,24 +94,24 @@
# karl update convenience
default_bin_loc=
- download_loc=$tmpdir/tl.$tlname.tar.gz
+ download_loc=$tmpdir/tl.$tlplat.tar.gz
grab="$download -O $download_loc"
if test x"$USER" = xkarl; then
- case $tlname in
+ case $tlplat in
alpha-linux)
default_bin_loc=/home/preining/alpha-linux.tar.gz;;
amd64-freebsd)
- download_loc=$tmpdir/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlplat.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://anthesphoria.net/FreeBSD/TeXLive-Devel/amd64-freebsd7.tar.xz;;
amd64-kfreebsd)
- download_loc=$tmpdir/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlplat.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab ftp://ftp.cea.fr/incoming/y2k01/braslau/x86_64-unknown-kfreebsd9.0-gnu.tar.xz;;
amd64-netbsd)
- download_loc=$tmpdir/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlplat.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://www.babafou.eu.org/texlive-netbsd/x86_64-netbsd.tar.xz;;
@@ -126,14 +126,17 @@
$grab http://www.jtartlabs.com/test/hppa2.0-hp-hpux10.20.tar.gz;;
i386-cygwin)
default_bin_loc=$download_loc
- $grab http://sanibeltranquility.com/cygwin/i386-cygwin.tgz;;
+ $grab http://sanibeltranquility.com/cygwin/$tlplat.tgz;;
+ i386-darwin)
+ default_bin_loc=$download_loc
+ $grab http://dl.contextgarden.net/build/texlive/$tlplat.xz;;
i386-freebsd)
- download_loc=$tmpdir/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlplat.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://anthesphoria.net/FreeBSD/TeXLive-Devel/i386-freebsd7.tar.xz;;
i386-kfreebsd)
- download_loc=$tmpdir/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlplat.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab ftp://ftp.cea.fr/incoming/y2k01/braslau/i386-unknown-kfreebsd10.0-gnu.tar.xz;;
@@ -140,7 +143,7 @@
i386-linux)
default_bin_loc=/tmp/lin32.tgz;;
i386-netbsd)
- download_loc=$tmpdir/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlplat.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://www.babafou.eu.org/texlive-netbsd/i386-netbsd.tar.xz;;
@@ -148,44 +151,41 @@
default_bin_loc=$download_loc
$grab http://students.dec.bmth.ac.uk/ebarrett/files/tl-bin-20080810.tgz;;
i386-solaris)
- download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
- grab="$download -O $download_loc"
- $grab http://www.math.fsu.edu/~ealdrov/texlive/2015/bin-i386-pc-solaris2.10.tar.gz;;
+ $grab http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz;;
mips-irix)
- download_loc=$tmpdir/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlplat.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://www.solid.ethz.ch/download/texlive/texlive-mips-irix.tar.xz;;
mipsel-linux)
echo "see mojca" >&2; exit 1;;
+ powerpc-darwin)
+ default_bin_loc=$download_loc
+ $grab http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz;;
powerpc-linux)
default_bin_loc=/home/tschmitz/powerpc.tar.xz;;
- universal-darwin)
- #download_loc=$tmpdir/tl.$tlname.tar.xz
- #default_bin_loc=$download_loc
- #grab="$download -O $download_loc"
- #$grab http://pages.uoregon.edu/koch/universal-darwin.tar.xz;;
- default_bin_loc=/home/koch/universal-darwin.tar.xz;;
+ sparc-solaris)
+ default_bin_loc=$download_loc
+ $grab http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz;;
win32)
- default_bin_loc=$tmpdir/tl.$tlname.zip
- $grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;;
+ # default_bin_loc=$tmpdir/tl.$tlplat.zip
+ # $grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;;
+ ;; # updated by Akira.
x86_64-cygwin)
default_bin_loc=$download_loc
- $grab http://sanibeltranquility.com/cygwin/x86_64-cygwin.tgz;;
+ $grab http://sanibeltranquility.com/cygwin/$tlplat.tgz;;
x86_64-darwin)
- #download_loc=$tmpdir/tl.$tlname.tar.xz
- #default_bin_loc=$download_loc
- #grab="$download -O $download_loc"
- #$grab http://pages.uoregon.edu/koch/x86_64-darwin.tar.xz;;
- default_bin_loc=/home/koch/x86_64-darwin.tar.xz;;
+ default_bin_loc=/home/koch/$tlplat.tar.xz;;
+ x86_64-darwinlegacy)
+ default_bin_loc=$download_loc
+ $grab http://dl.contextgarden.net/build/texlive/x86_64-darwin.tar.xz;;
x86_64-linux)
- default_bin_loc=/home/texlive/karl/Build/source/inst/bin/x86_64-pc-linux-gnu;;
+ # local: default_bin_loc=/home/texlive/karl/Build/source/inst/bin/x86_64-pc-linux-gnu;;
+ ;; # updated by Norbert.
x86_64-solaris)
- download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
- grab="$download -O $download_loc"
- $grab http://www.math.fsu.edu/~ealdrov/texlive/2015/bin-x86_64-pc-solaris2.10.tar.gz;;
+ $grab http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz;;
esac
fi
Modified: trunk/Master/tlpkg/bin/tlpsizes
===================================================================
--- trunk/Master/tlpkg/bin/tlpsizes 2017-04-28 23:01:00 UTC (rev 44108)
+++ trunk/Master/tlpkg/bin/tlpsizes 2017-04-28 23:12:11 UTC (rev 44109)
@@ -53,9 +53,8 @@
my @pkgs = $tlpdb->expand_dependencies ("-no-collections", $tlpdb, $name);
# get sizes of those packages.
- # args say: include src, include doc, just i386-linux for a
- # mid-sized sample, just our pkgs.
- my $pkg_sizes = $tlpdb->sizes_of_packages (1, 1, ["i386-linux"], @pkgs);
+ # args say: include src, include doc, just one platform.
+ my $pkg_sizes = $tlpdb->sizes_of_packages (1, 1, ["x86_64-linux"], @pkgs);
$c_size{$name} = $pkg_sizes->{__TOTAL__};
delete $pkg_sizes->{"__TOTAL__"}; # don't need that any more
@@ -68,8 +67,9 @@
for my $c (sort { $c_size{$b} <=> $c_size{$a} }
keys %c_size) {
- printf "%4d %-${longest_name}s %s\n",
- $c_size{$c}/1024/1024, $c, $c_pkgs{$c};
+ my $count = ($c_pkgs{$c} =~ tr/ / /);
+ printf "%4d %-${longest_name}s %4s%s\n",
+ $c_size{$c}/1024/1024, $c, $count, $c_pkgs{$c};
}
return 0;
More information about the tex-live-commits
mailing list