summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-07 02:33:22 +0000
committerKarl Berry <karl@freefriends.org>2012-08-07 02:33:22 +0000
commitc425ae44047f4029164713c73f22f44291dd9049 (patch)
tree53ce79a384c4b629fa5001292247c957ea8ab3f8
parentbb5e48f7491691042300ba174e5d5a3df842ce16 (diff)
/home/texlive/karl/Master/tlpkg/bin/tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@27325 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/build-aux/depcomp75
-rwxr-xr-xBuild/source/extra/xz/build-aux/depcomp75
-rw-r--r--Master/doc.html27
3 files changed, 164 insertions, 13 deletions
diff --git a/Build/source/build-aux/depcomp b/Build/source/build-aux/depcomp
index debb6ffa3ea..0544c683513 100755
--- a/Build/source/build-aux/depcomp
+++ b/Build/source/build-aux/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2012-07-12.20; # UTC
# Copyright (C) 1999-2012 Free Software Foundation, Inc.
@@ -334,6 +334,79 @@ icc)
rm -f "$tmpdepfile"
;;
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file. A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+ # Portland's C compiler understands '-MD'.
+ # Will always output deps to 'file.d' where file is the root name of the
+ # source file under compilation, even if file resides in a subdirectory.
+ # The object file name does not affect the name of the '.d' file.
+ # pgcc 10.2 will output
+ # foo.o: sub/foo.c sub/foo.h
+ # and will wrap long lines using '\' :
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ # Use the source, not the object, to determine the base name, since
+ # that's sadly what pgcc will do too.
+ base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'`
+ tmpdepfile="$base.d"
+
+ # For projects that build the same source file twice into different object
+ # files, the pgcc approach of using the *source* file root name can cause
+ # problems in parallel builds. Use a locking strategy to avoid stomping on
+ # the same $tmpdepfile.
+ lockdir="$base.d-lock"
+ trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15
+ numtries=100
+ i=$numtries
+ while test $i -gt 0 ; do
+ # mkdir is a portable test-and-set.
+ if mkdir $lockdir 2>/dev/null; then
+ # This process acquired the lock.
+ "$@" -MD
+ stat=$?
+ # Release the lock.
+ rm -rf $lockdir
+ break
+ else
+ ## the lock is being held by a different process,
+ ## wait until the winning process is done or we timeout
+ while test -d $lockdir && test $i -gt 0; do
+ sleep 1
+ i=`expr $i - 1`
+ done
+ fi
+ i=`expr $i - 1`
+ done
+ trap - 1 2 13 15
+ if test $i -le 0; then
+ echo "$0: failed to acquire lock after $numtries attempts" >&2
+ echo "$0: check lockdir '$lockdir'" >&2
+ exit 1
+ fi
+
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
hp2)
# The "hp" stanza above does not work with aCC (C++) and HP's ia64
# compilers, which have integrated preprocessors. The correct option
diff --git a/Build/source/extra/xz/build-aux/depcomp b/Build/source/extra/xz/build-aux/depcomp
index debb6ffa3ea..0544c683513 100755
--- a/Build/source/extra/xz/build-aux/depcomp
+++ b/Build/source/extra/xz/build-aux/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2012-07-12.20; # UTC
# Copyright (C) 1999-2012 Free Software Foundation, Inc.
@@ -334,6 +334,79 @@ icc)
rm -f "$tmpdepfile"
;;
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file. A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+ # Portland's C compiler understands '-MD'.
+ # Will always output deps to 'file.d' where file is the root name of the
+ # source file under compilation, even if file resides in a subdirectory.
+ # The object file name does not affect the name of the '.d' file.
+ # pgcc 10.2 will output
+ # foo.o: sub/foo.c sub/foo.h
+ # and will wrap long lines using '\' :
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ # Use the source, not the object, to determine the base name, since
+ # that's sadly what pgcc will do too.
+ base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'`
+ tmpdepfile="$base.d"
+
+ # For projects that build the same source file twice into different object
+ # files, the pgcc approach of using the *source* file root name can cause
+ # problems in parallel builds. Use a locking strategy to avoid stomping on
+ # the same $tmpdepfile.
+ lockdir="$base.d-lock"
+ trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15
+ numtries=100
+ i=$numtries
+ while test $i -gt 0 ; do
+ # mkdir is a portable test-and-set.
+ if mkdir $lockdir 2>/dev/null; then
+ # This process acquired the lock.
+ "$@" -MD
+ stat=$?
+ # Release the lock.
+ rm -rf $lockdir
+ break
+ else
+ ## the lock is being held by a different process,
+ ## wait until the winning process is done or we timeout
+ while test -d $lockdir && test $i -gt 0; do
+ sleep 1
+ i=`expr $i - 1`
+ done
+ fi
+ i=`expr $i - 1`
+ done
+ trap - 1 2 13 15
+ if test $i -le 0; then
+ echo "$0: failed to acquire lock after $numtries attempts" >&2
+ echo "$0: check lockdir '$lockdir'" >&2
+ exit 1
+ fi
+
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
hp2)
# The "hp" stanza above does not work with aCC (C++) and HP's ia64
# compilers, which have integrated preprocessors. The correct option
diff --git a/Master/doc.html b/Master/doc.html
index 27b4b694d55..6e01856dc2d 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -9407,6 +9407,11 @@ Typeset sets of pages upside-down and backwards.
<a href="texmf-dist/doc/latex/rotpages/Examples/rotpages-singlecolumn-ex.pdf">rotpages-singlecolumn-ex.pdf</a>.
</small></li>
+<li><b><a href="texmf-dist/doc/latex/rrgtrees">rrgtrees</a></b>:<small>
+Linguistic tree diagrams for Role and Reference Grammar (RRG) with LaTeX.
+<a href="texmf-dist/doc/latex/rrgtrees/rrgtrees.pdf">rrgtrees.pdf</a>.
+</small></li>
+
<li><b><a href="texmf-dist/doc/latex/rsc">rsc</a></b>:<small>
BibTeX style for use with RSC journals.
<a href="texmf-dist/doc/latex/rsc/rsc.pdf">rsc.pdf</a>.
@@ -9453,7 +9458,7 @@ Class for Ryerson Unversity Graduate School requirements.
<h2 id="letter-S">S</h2>
-<ol start="1437">
+<ol start="1438">
<li><b><a href="texmf-dist/doc/latex/sageep">sageep</a></b>:<small>
Format papers for the annual meeting of EEGS.
@@ -10343,7 +10348,7 @@ Format systems of equations.
<h2 id="letter-T">T</h2>
-<ol start="1577">
+<ol start="1578">
<li><b><a href="texmf-dist/doc/latex/t-angles">t-angles</a></b>:<small>
Draw tangles, trees, Hopf algebra operations and other pictures.
@@ -10899,11 +10904,11 @@ Collect files related to a LaTeX job in a single directory.
<a href="texmf/doc/man/man1/texdirflatten.man1.pdf">texdirflatten.man1.pdf</a>.
</small></li>
-<li><b><a href="texmf/doc/man/man1">texdoc</a></b>:<small>
+<li><b><a href="texmf-dist/doc/texdoc">texdoc</a></b>:<small>
Documentation access for TeX distributions.
+<a href="texmf-dist/doc/texdoc/texdoc.pdf">texdoc.pdf</a>,
<a href="texmf/doc/man/man1/texdoc.man1.pdf">texdoc.man1.pdf</a>,
-<a href="texmf/doc/man/man1/texdoctk.man1.pdf">texdoctk.man1.pdf</a>,
-<a href="texmf/doc/texdoc/texdoc.pdf">texdoc.pdf</a>.
+<a href="texmf/doc/man/man1/texdoctk.man1.pdf">texdoctk.man1.pdf</a>.
</small></li>
<li><b><a href="texmf-dist/doc/support/texdraw">texdraw</a></b>:<small>
@@ -11632,7 +11637,7 @@ Print a typographic grid.
<h2 id="letter-U">U</h2>
-<ol start="1747">
+<ol start="1748">
<li><b><a href="texmf-dist/doc/latex/uaclasses">uaclasses</a></b>:<small>
University of Arizona thesis and dissertation format.
@@ -11817,7 +11822,7 @@ University of Washington thesis class.
<h2 id="letter-V">V</h2>
-<ol start="1780">
+<ol start="1781">
<li><b><a href="texmf-dist/doc/bibtex/vancouver">vancouver</a></b>:<small>
Bibliographic style file for Biomedical Journals.
@@ -11979,7 +11984,7 @@ Variable-width multiple text columns.
<h2 id="letter-W">W</h2>
-<ol start="1807">
+<ol start="1808">
<li><b><a href="texmf-dist/doc/fonts/wadalab">wadalab</a></b>:<small>
Wadalab (Japanese) font packages.
@@ -12061,7 +12066,7 @@ Produces figures which text can flow around.
<h2 id="letter-X">X</h2>
-<ol start="1821">
+<ol start="1822">
<li><b><a href="texmf-dist/doc/latex/xargs">xargs</a></b>:<small>
Define commands with many optional arguments.
@@ -12306,7 +12311,7 @@ Tree macros using XY-Pic.
<h2 id="letter-Y">Y</h2>
-<ol start="1859">
+<ol start="1860">
<li><b><a href="texmf-dist/doc/latex/yafoot">yafoot</a></b>:<small>
A bundle of miscellaneous footnote packages.
@@ -12354,7 +12359,7 @@ Many-featured Young tableaux and Young diagrams.
<h2 id="letter-Z">Z</h2>
-<ol start="1867">
+<ol start="1868">
<li><b><a href="texmf-dist/doc/latex/zed-csp">zed-csp</a></b>:<small>
Typesetting Z and CSP format specifications.