summaryrefslogtreecommitdiff
path: root/Build/source/build-aux
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 /Build/source/build-aux
parent8c5f6819321bca65bee1f9bb8e6fcb86ec3c3bac (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@40250 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/build-aux')
-rw-r--r--Build/source/build-aux/README.TL34
-rwxr-xr-xBuild/source/build-aux/compile9
-rwxr-xr-xBuild/source/build-aux/test-driver15
3 files changed, 38 insertions, 20 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"