summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-05 18:20:42 +0000
committerKarl Berry <karl@freefriends.org>2016-04-05 18:20:42 +0000
commite21287339287302044cb48d13675c1db831fa694 (patch)
tree9196498b59c377bb3eb4b159892e2ff9435e4195
parent8c5f6819321bca65bee1f9bb8e6fcb86ec3c3bac (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@40250 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/build-aux/README.TL34
-rwxr-xr-xBuild/source/build-aux/compile9
-rwxr-xr-xBuild/source/build-aux/test-driver15
-rw-r--r--Build/source/libs/README2
-rw-r--r--Build/source/libs/icu/icu-PATCHES/TL-Changes3
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl47
-rwxr-xr-xBuild/source/texk/texlive/w32_wrapper/runscript.tlu4
-rw-r--r--Master/tlpkg/dev/srclist.txt17
8 files changed, 78 insertions, 53 deletions
diff --git a/Build/source/build-aux/README.TL b/Build/source/build-aux/README.TL
index 6860b621504..18976ae85ef 100644
--- a/Build/source/build-aux/README.TL
+++ b/Build/source/build-aux/README.TL
@@ -1,20 +1,28 @@
-Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+$Id$
+Copyright 2016 Karl Berry <tex-live@tug.org>
+Copyright 2009-2013 Peter Breitenlohner <tex-live@tug.org>
You may freely use, modify and/or distribute this file.
This directory is the central repository for auxiliary files, mostly
shell scripts, needed to build the TeX Live (TL) tree. They are used by
-all packages `owned' by the TL tree, i.e., maintained as part of TL.
+all packages included in the TL tree, whether or not TL is the actual
+owner/maintainer of the package
-compile, missing, test-driver, and ylwrap come from automake; ltmain.sh
-comes from libtool. Those must be manually updated when new versions of the
-packages are installed. The Master/tlpkg/dev/srclist.txt file has checks
-for these, but updates are not automatic. (We generally try to use the
-latest official release, as it is available directly from GNU, not any
-distro version.)
+The files fall into three sets:
-relpath is locally written.
+0) relpath is locally written.
-The rest of these files are maintained elsewhere and are available from
-the GNU gnulib project (http://savannah.gnu.org/projects/gnulib). The
-script Master/tlpkg/bin/tl-update-auto attempts to keep those up to date
-(except when the TL sources are frozen).
+1) Those in GNU Gnulib (http://savannah.gnu.org/projects/gnulib). The
+script Master/tlpkg/bin/tl-update-auto attempts to keep these up to date
+nightly (except when the TL sources are frozen).
+
+2) Those not in Gnulib, that must come directly from an automake or
+libtool installation. These must be manually updated when new versions
+of those GNU packages are installed. The Master/tlpkg/dev/srclist.txt
+file checks for these relative to installation on the local machine, but
+updates are not automatic.
+
+There should be no other files in this directory.
+
+We generally try to use the latest official release, as it is available
+directly from GNU, rather than any distro or other patched version.
diff --git a/Build/source/build-aux/compile b/Build/source/build-aux/compile
index 531136b068e..4bfd30ccf3a 100755
--- a/Build/source/build-aux/compile
+++ b/Build/source/build-aux/compile
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2015 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -342,6 +343,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/Build/source/build-aux/test-driver b/Build/source/build-aux/test-driver
index d30605660a0..8e575b017d9 100755
--- a/Build/source/build-aux/test-driver
+++ b/Build/source/build-aux/test-driver
@@ -3,7 +3,7 @@
scriptversion=2013-07-13.22; # UTC
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15
# Test script is run here.
"$@" >$log_file 2>&1
estatus=$?
+
if test $enable_hard_errors = no && test $estatus -eq 99; then
- estatus=1
+ tweaked_estatus=1
+else
+ tweaked_estatus=$estatus
fi
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
@@ -119,6 +122,12 @@ case $estatus:$expect_failure in
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
esac
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
# Report outcome to console.
echo "${col}${res}${std}: $test_name"
diff --git a/Build/source/libs/README b/Build/source/libs/README
index aae337699e4..cdcb68da198 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -66,5 +66,5 @@ xpdf 3.04 - checked 28may14
zlib 1.2.8 - checked 18may13
http://www.zlib.net/ - used by many
-zziplib 0.13.62 - checked 12mar12
+zziplib 0.13.62 - checked 31mar16
http://zziplib.sourceforge.net/ - used by luatex
diff --git a/Build/source/libs/icu/icu-PATCHES/TL-Changes b/Build/source/libs/icu/icu-PATCHES/TL-Changes
index 3fd6e38876c..90bded3540c 100644
--- a/Build/source/libs/icu/icu-PATCHES/TL-Changes
+++ b/Build/source/libs/icu/icu-PATCHES/TL-Changes
@@ -42,7 +42,8 @@ diff $srcdat $indat
# C++ binary and we didn't cxx-hack it.
icupkg="env LD_LIBRARY_PATH=$gnu/lib ../../../../bin/icupkg"
-# then remove some unused-by-xetex elements, as discussed with xetex dev.
+# then remove some elements unused by the icu clients in our tree, namely
+# bibtexu (in texk/bibtex-x), upmendex, and xetex (in texk/web2c/xetexdir).
outdat=icudt57l.dat
$icupkg -r 'curr/*' $indat $outdat && mv $outdat $indat
$icupkg -r 'lang/*' $indat $outdat && mv $outdat $indat
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 62e4d229b32..90347074384 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,13 +1,13 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 40189 2016-03-31 00:38:03Z preining $
+# $Id: tlmgr.pl 40203 2016-03-31 23:25:42Z karl $
#
# Copyright 2008-2016 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
-my $svnrev = '$Revision: 40189 $';
-my $datrev = '$Date: 2016-03-31 02:38:03 +0200 (Thu, 31 Mar 2016) $';
+my $svnrev = '$Revision: 40203 $';
+my $datrev = '$Date: 2016-04-01 01:25:42 +0200 (Fri, 01 Apr 2016) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -7559,24 +7559,24 @@ creates configuration files in user tree
=head1 CONFIGURATION FILE FOR TLMGR
-There are two configuration files for C<tlmgr>: One is system wide
-in C<TEXMFSYSCONFIG/tlmgr/config>, and one user-specific in
-C<TEXMFCONFIG/tlmgr/config> (which is in the default setup
-C<~/.texliveYYYY/texmf-config/tlmgr/config> replacing
-C<YYYY> with the year of your TeX Live installation).
+There are two configuration files for C<tlmgr>: One is system-wide in
+C<TEXMFSYSCONFIG/tlmgr/config>, and the other is user-specific in
+C<TEXMFCONFIG/tlmgr/config> (in the default setup, that is
+C<~/.texliveYYYY/texmf-config/tlmgr/config>, where C<YYYY> is the
+release year of your TeX Live installation).
A small subset of the command line options can be set in these
-configuration file. In addition, the system-wide can contain a directive
-to restrict the number of allowed actions.
+configuration files. In addition, the system-wide file can contain a
+directive to restrict the number of allowed actions.
-In these config files, empty lines and lines starting with # are ignored. All
-other lines must look like
+In these config files, empty lines and lines starting with # are
+ignored. All other lines must look like
key = value
where the allowed keys are C<gui-expertmode> (value 0 or 1),
C<persistent-downloads> (value 0 or 1), C<auto-remove> (value 0 or 1),
-and C<gui-lang> (value like in the command line option).
+and C<gui-lang> (value as with the command-line option).
C<persistent-downloads>, C<gui-lang>, and C<auto-remove> correspond to
the respective command line options of the same name. C<gui-expertmode>
@@ -7584,11 +7584,12 @@ switches between the full GUI and a simplified GUI with only the
important and mostly used settings.
In addition, the system-wide config file can contain the key
-C<allowed-actions>. The value is a comma separated list of actions that
-are allowed to be executed when C<tlmgr> is called in system mode (that is
-without C<--usermode>). This allows distributors to include the C<tlmgr>
-in the packaging but allow only for a very restricted set of actions not
-to interfere with package managers.
+C<allowed-actions>. The value is a comma-separated list of actions that
+are allowed to be executed when C<tlmgr> is called in system mode (that
+is, without C<--usermode>). This allows distributors to include the
+C<tlmgr> in their packaging, but allow only a restricted set of actions
+that do not interfere with the distro package managers. (For native TeX
+Live installations, it doesn't make sense to set this.)
=head1 MULTIPLE REPOSITORIES
@@ -7602,11 +7603,11 @@ The simplest and most reliable method is to temporarily set the
installation source to any repository (with the C<-repository> or
C<option repository> command line options), and perform your operations.
-When you are using multiple repositories over a sustained time, however,
-explicitly switching between them becomes inconvenient. Thus, it's
-possible to tell C<tlmgr> about additional repositories you want to use.
-The basic command is C<tlmgr repository add>. The rest of this section
-explains further.
+When you are using multiple repositories over a sustained length of
+time, however, explicitly switching between them becomes inconvenient.
+Thus, it's possible to tell C<tlmgr> about additional repositories you
+want to use. The basic command is C<tlmgr repository add>. The rest of
+this section explains further.
When using multiple repositories, one of them has to be set as the main
repository, which distributes most of the installed packages. When you
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
index 9698b7f735e..53deaf07125 100755
--- a/Build/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 39066 $", "%d+") or "0"
-local svndate = string.match("$Date: 2015-12-11 05:51:32 +0900 (Fri, 11 Dec 2015) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 39067 $", "%d+") or "0"
+local svndate = string.match("$Date: 2015-12-10 23:28:26 +0100 (Thu, 10 Dec 2015) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt
index a4e8a9e10e7..4a06a644b7f 100644
--- a/Master/tlpkg/dev/srclist.txt
+++ b/Master/tlpkg/dev/srclist.txt
@@ -14,7 +14,7 @@
# The output will be diffs for any files that are not up to date.
# Basic config files.
-# dev changes Master/texmf-dist/web2c/texmf.cnf Build/source/texk/kpathsea/
+Master/texmf-dist/web2c/texmf.cnf Build/source/texk/kpathsea/
Master/texmf-dist/web2c/fmtutil.cnf Build/source/texk/texlive/tl_scripts/fmtutil.cnf
# Platform detection for tests:
@@ -39,9 +39,14 @@ Build/source/texk/dvipdfm-x/data/pdfglyphlist.txt Master/texmf-dist/fonts/map/gl
Build/source/texk/dvipdfm-x/data/dvipdfmx.cfg Master/texmf-dist/dvipdfmx/dvipdfmx.cfg
# Scripts from GNU packages (locally) installed on the system; see
-# Build/source/build-aux/README.TL. The version number embedded in the
-# automake path is unfortunate (have to update manually at new automake
-# releases), but automake provides no version-independent access.
+# Build/source/build-aux/README.TL.
+#
+# The version number embedded in the automake path is unfortunate (have
+# to update manually at new automake releases), but automake provides no
+# version-independent access.
+#
/usr/local/gnu/share/libtool/build-aux/ltmain.sh Build/source/build-aux/ltmain.sh
-/usr/local/gnu/share/automake-1.15/missing Build/source/build-aux/missing
-/usr/local/gnu/share/automake-1.15/ylwrap Build/source/build-aux/ylwrap
+#
+/usr/local/gnu/share/automake-1.15/missing Build/source/build-aux/missing
+/usr/local/gnu/share/automake-1.15/test-driver Build/source/build-aux/test-driver
+/usr/local/gnu/share/automake-1.15/ylwrap Build/source/build-aux/ylwrap