summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-19 16:04:06 +0000
committerKarl Berry <karl@freefriends.org>2019-10-19 16:04:06 +0000
commit4445ccd132b60e690b2efa2eee231b5c02dae9b4 (patch)
tree728852922b9aa5c3f0426100332ec57fa173ed4d
parentb3b99d42907955ecc722513582e96f370d943bac (diff)
doc,sync
git-svn-id: svn://tug.org/texlive/trunk@52440 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl3
-rw-r--r--Master/texmf-dist/scripts/texlive/NEWS4
-rwxr-xr-xMaster/tlpkg/bin/c2l3
-rwxr-xr-xMaster/tlpkg/bin/tl-update-asy13
4 files changed, 11 insertions, 12 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
index c34147b4d8e..66752b67cd9 100755
--- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
+++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
@@ -2105,7 +2105,8 @@ proc populate_main {} {
incr inx
menu .mn.opt.paper
foreach p [list A4 letter] {
- .mn.opt.paper add command -label $p -command "set_paper $p"
+ .mn.opt.paper add command -label $p -command \
+ "set_paper [string tolower $p]"
}
if {[llength $::langs] > 1} {
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index 803f7921f25..fd0e1410bc5 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -1,7 +1,9 @@
(This file public domain. Originally written by Norbert Preining and
Karl Berry, 2010.)
-<li>check-runfiles ignore latex-.*-dev packages.
+<li>tlmgr check runfiles: ignore latex-.*-dev packages.
+<li>reduce download retries for curl and wget from 10 to 4.
+
<p><b>tlmgr 51555 (released 5jul19):</b>
<li>runscript.tlu: use vbscript for GUI error boxes, so tlshell can be
diff --git a/Master/tlpkg/bin/c2l b/Master/tlpkg/bin/c2l
index d919c56aa99..c90c2bfa6b0 100755
--- a/Master/tlpkg/bin/c2l
+++ b/Master/tlpkg/bin/c2l
@@ -28,8 +28,7 @@ sub main {
$arg = "i386-cygwin";
} elsif ($arg eq "dar32") {
$arg = "i386-darwin";
- } elsif ($arg eq "darwin" || $arg eq "dar"
- || $arg eq "mac" || $arg eq "mactex") {
+ } elsif ($arg eq "darwin" || $arg eq "dar" || $arg eq "mac") {
$arg = "x86_64-darwin";
} elsif ($arg eq "darleg") {
$arg = "x86_64-darwinlegacy";
diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy
index 62f3ce20fc1..7994b6343e0 100755
--- a/Master/tlpkg/bin/tl-update-asy
+++ b/Master/tlpkg/bin/tl-update-asy
@@ -22,16 +22,16 @@ if false && $update_sources_from_ctan; then
\cp -arf /home/ftp/tex-archive/graphics/asymptote/ .
cd asymptote
- ver=`awk -F\" '{print $2}' revision.cc` # the newly-released version
+ ver=`awk -F\" '{print $2}' revision.cc | sed 1q` # the newly-released version
echo $ver
# show list of new files to add:
svn status | sed -n 's/^\?//p' | fgrep -v binaries
svn add `!!`
- # show list of files to remove (keep free)
+ # show list of files to remove (keep gc-7.6.2 until new is working):
diff -qr . /home/ftp/tex-archive/graphics/asymptote/ \
- | egrep -v ' differ' | egrep -v '\.svn'
+ | egrep -v ' differ' | egrep -v '\.svn|gc-7.6.2'
svn rm ...
# final check and commit:
@@ -45,7 +45,7 @@ elif test "x$1" = x--build; then
# Despite all the dire warnings above, this part actually can be run
# as a script, because it's so often necessary to redo.
set -e
- PATH=/usr/bin:/bin:/sbin; export PATH # system gcc for sake of shared libs
+ PATH=/usr/bin:/usr/sbin; export PATH # system gcc for sake of shared libs
#PATH=/usr/local/bin:$PATH # need new gs to pass tests, but ok
PATH=$lb:$PATH # get our kpsewhich
svn=/usr/local/bin/svn # so we need our svn explicitly
@@ -63,13 +63,10 @@ elif test "x$1" = x--build; then
fi
rm -rf config.cache config.h config.log config.status errors.temp
rm -rf /tmp/ainst autom4te.cache
- # these configure options represent what is intended to be supported
- # in the x86_64-linux build.
- ASYMPTOTE_EPSDRIVER=epswrite; export ASYMPTOTE_EPSDRIVER
./configure --prefix=/tmp/ainst \
--with-latex=/tmp/ainst/latex --with-context=/tmp/ainst/context \
--disable-fftw --disable-gl --disable-gsl \
- --enable-texlive-build CFLAGS=-g CXXFLAGS="-std=c++11 -DNOHASH" #-ansi
+ --enable-texlive-build CFLAGS=-g CXXFLAGS=-std=c++11 #-ansi
make
make check
make install-prebuilt