texlive[43894] trunk: install-tl (TEXLIVE_INSTALL_ENV_NOCHECK):
commits+karl at tug.org
commits+karl at tug.org
Mon Apr 17 17:42:58 CEST 2017
Revision: 43894
http://tug.org/svn/texlive?view=revision&revision=43894
Author: karl
Date: 2017-04-17 17:42:57 +0200 (Mon, 17 Apr 2017)
Log Message:
-----------
install-tl (TEXLIVE_INSTALL_ENV_NOCHECK): respect this in all cases.
(TEXLIVE_INSTALL_NO_WELCOME): new envvar control for quiet.
<keyrename>: option_symlinks -> instopt_adjustpath, I guess.
(create_welcome): use here-documents for better readability.
tl-update-tlnet: use (TEXLIVE_INSTALL_NO_WELCOME, some (not all)
resulting simplifications of regexp filtering.
texconfig.sh, source/README: doc, sync.
Modified Paths:
--------------
trunk/Build/source/README
trunk/Master/install-tl
trunk/Master/texmf-dist/scripts/texlive/texconfig.sh
trunk/Master/tlpkg/bin/tl-update-tlnet
Modified: trunk/Build/source/README
===================================================================
--- trunk/Build/source/README 2017-04-17 14:18:34 UTC (rev 43893)
+++ trunk/Build/source/README 2017-04-17 15:42:57 UTC (rev 43894)
@@ -33,7 +33,7 @@
bug that causes lcdf-typetools's tfm.test to fail, so it can't be used
for everything. Sigh.
-x86_64-linux: Debian 5.0 (Lenny), Feb 2009.
+x86_64-linux: Debian 6.0 (Squeeze), Feb 2009.
amd64-netbsd:
gcc version 4.5.3 (NetBSD nb2 20110806)
@@ -40,6 +40,9 @@
NetBSD/amd64 6.1.3
TL_MAKE=gmake LDFLAGS='-L/usr/X11R7/lib -Wl,-rpath,/usr/X11R7/lib' ./Build
+i386-freebsd, amd64-freebsd:
+ --disable-dvisvgm; upmendex for i386 built with -DU_IS_BIG_ENDIAN=0.
+
i386-openbsd, amd64-openbsd:
e.g., see CONFIGURE_ARGS in the Makefile in
http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/print/texlive/base/
@@ -56,5 +59,15 @@
sparc-solaris: Solaris 10, gcc. See doc/README.solaris.
-universal-darwin, x86_64-darwin: a menagerie of versions.
+x86_64-darwin:
See Master/source/mactexdoc.tar.xz.
+
+x86_64-darwinlegacy, i386-darwin, powerpc-darwin:
+ http://build.contextgarden.net/waterfall?tag=c/texlive
+ 32-bit binaries built on 10.6/x86_64 with backward compatibility to 10.5.
+ ppc binaries only work on <= 10.5, so 10.5/ppc will be the only OS for them.
+ i386 binaries only work on <= 10.6. While they theoretically work
+ "everywhere", they would only be used on 10.5 and 10.6/i386.
+ x86_64 binaries only work on >= 10.6 (and should work on any >= 10.6 machine)
+ but will only be used for < 10.10 since x86_64-darwin covers newer.
+ PPC binaries made with gcc-4.2 and Intel binaries with clang-3.7.
Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl 2017-04-17 14:18:34 UTC (rev 43893)
+++ trunk/Master/install-tl 2017-04-17 15:42:57 UTC (rev 43894)
@@ -593,9 +593,11 @@
foreach my $t (@::WARNLINES) { print STDERR $t; }
}
if ($::env_warns) { print STDERR $::env_warns; }
- foreach my $t (@::welcome_arr) {
- printf STDERR sprintf (shift @$t, @$t);
- print STDERR "\n";
+ unless ($ENV{"TEXLIVE_INSTALL_NO_WELCOME"}) {
+ foreach my $t (@::welcome_arr) {
+ printf STDERR sprintf (shift @$t, @$t);
+ print STDERR "\n";
+ }
}
do_cleanup(); # sets $::LOGFILENAME if not already defined
if ($LOGFILENAME) {
@@ -881,7 +883,7 @@
#$errcount += 2;
# check environment for possibly tex-related strings:
- check_env();
+ check_env() unless $ENV{"TEXLIVE_INSTALL_ENV_NOCHECK"};
# log, profile, temp files:
do_cleanup();
@@ -1797,15 +1799,16 @@
my $profilepath = shift;
my %opts = @_;
my %keyrename = (
+ 'option_doc' => 'tlpdbopt_install_docfiles',
+ 'option_fmt' => 'tlpdbopt_create_formats',
+ 'option_src' => 'tlpdbopt_install_srcfiles',
'option_sys_bin' => 'tlpdbopt_sys_bin',
+ 'option_sys_info' => 'tlpdbopt_sys_info',
'option_sys_man' => 'tlpdbopt_sys_man',
- 'option_sys_info' => 'tlpdbopt_sys_info',
- 'option_doc' => 'tlpdbopt_install_docfiles',
- 'option_src' => 'tlpdbopt_install_srcfiles',
- 'option_fmt' => 'tlpdbopt_create_formats',
+ 'option_adjustrepo' => 'instopt_adjustrepo',
+ 'option_letter' => 'instopt_letter',
'option_path' => 'instopt_adjustpath',
- 'option_letter' => 'instopt_letter',
- 'option_adjustrepo' => 'instopt_adjustrepo',
+ 'option_symlinks' => 'instopt_adjustpath',
'portable' => 'instopt_portable',
);
@@ -2336,15 +2339,27 @@
# This is an array of references to anonymous arrays of parameters for
# either __ or sprintf: a localizable string, possibly with placeholders,
# followed by parameters for those placeholders, if any.
-
+#
sub create_welcome {
@::welcome_arr = ();
push @::welcome_arr, (["\nWelcome to TeX Live!\n"]);
- push @::welcome_arr, [
- "See\n %s/index.html\nfor links to documentation.\nThe TeX Live web site (https://tug.org/texlive/)\ncontains updates and corrections.\n\nTeX Live is a joint project of the TeX user groups around the world;\nplease consider supporting it by joining the group best for you.\nThe list of groups is available on the web at http://tug.org/usergroups.html.\n",
+ push @::welcome_arr, [ <<END_WELCOME_GENERIC,
+Documentation links: %s/index.html
+The TeX Live web site (https://tug.org/texlive/)
+contains updates and corrections.
+
+TeX Live is a joint project of the TeX user groups around the world;
+please consider supporting it by joining the group best for you.
+The list of groups is on the web at https://tug.org/usergroups.html.
+END_WELCOME_GENERIC
$::vars{'TEXDIR'}];
if (!win32()) {
- push @::welcome_arr, ["Add %s/texmf-dist/doc/man to MANPATH.\nAdd %s/texmf-dist/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.",
+ push @::welcome_arr, [ <<END_WELCOME_W32,
+Add %s/texmf-dist/doc/man to MANPATH.
+Add %s/texmf-dist/doc/info to INFOPATH.
+Most importantly, add %s/bin/%s
+to your PATH for current and future sessions.
+END_WELCOME_W32
$::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'},
$::vars{'this_platform'}];
}
@@ -2763,6 +2778,11 @@
Omit creating the ConTeXt cache. This is useful for redistributors.
+=item C<TEXLIVE_INSTALL_NO_WELCOME>
+
+Omit printing the welcome message after successful installation, e.g.,
+for testing.
+
=item C<TEXLIVE_INSTALL_PREFIX>
=item C<TEXLIVE_INSTALL_TEXDIR>
Modified: trunk/Master/texmf-dist/scripts/texlive/texconfig.sh
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/texconfig.sh 2017-04-17 14:18:34 UTC (rev 43893)
+++ trunk/Master/texmf-dist/scripts/texlive/texconfig.sh 2017-04-17 15:42:57 UTC (rev 43894)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: texconfig.sh 34586 2014-07-13 00:06:11Z karl $
+# $Id: texconfig.sh 43845 2017-04-16 17:39:12Z karl $
# texconfig version 3.0
# Originally written by Thomas Esser. Public domain.
# Now maintained as part of TeX Live; correspondence to tex-live at tug.org.
@@ -28,7 +28,7 @@
progname=texconfig
# the version string
-version='$Id: texconfig.sh 34586 2014-07-13 00:06:11Z karl $'
+version='$Id: texconfig.sh 43845 2017-04-16 17:39:12Z karl $'
envVars="
AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS
@@ -559,7 +559,6 @@
Usage: $progname conf (show configuration information)
$progname dvipdfmx paper PAPER (dvipdfmx paper size)
- $progname dvipdfm paper PAPER (dvipdfm paper size)
$progname dvips [OPTION...] (dvips options)
$progname faq (show teTeX faq)
$progname findprog PROG... (show locations of PROGs, a la which)
@@ -580,7 +579,6 @@
Get more help with:
$progname dvipdfmx
- $progname dvipdfm
$progname dvips
$progname font
$progname hyphen
@@ -603,13 +601,13 @@
echo
echo '==================== binaries found by searching $PATH ==================='
echo "PATH=$PATH"
- echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfm
+ echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfmx
echo
echo '=========================== active config files =========================='
echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort -k 2
echo
echo '============================= font map files ============================='
- for m in psfonts.map pdftex.map ps2pk.map dvipdfm.map; do
+ for m in psfonts.map pdftex.map ps2pk.map; do
echo "$m: `kpsewhich $m`"
done
echo
@@ -621,39 +619,6 @@
echoShowVariable $envVars
;;
- # texconfig dvipdfm
- dvipdfm)
- help="Usage: $progname dvipdfm paper PAPER
-
-Valid PAPER settings:
- letter legal ledger tabloid a4 a3"
- case $2 in
- # texconfig dvipdfm paper
- paper-list)
- for p in letter legal ledger tabloid a4 a3; do echo $p; done
- ;;
- paper)
- case $3 in
- letter|legal|ledger|tabloid|a4|a3)
- fmgrConfigReplace config '^p' "p $3";;
- "") echo "$help" >&2; rc=1;;
- *)
- echo "$progname: unknown PAPER \`$3' given as argument for \`$progname dvipdfm paper'" >&2
- echo "$progname: try \`$progname dvipdfm paper' for help" >&2
- rc=1 ;;
- esac ;;
- # texconfig dvipdfm ""
- "")
- echo "$help" >&2; rc=1 ;;
- # texconfig dvipdfm <unknown>
- *)
- echo "$progname: unknown option \`$2' given as argument for \`$progname dvipdfm'" >&2
- echo "$progname: try \`$progname dvipdfm' for help" >&2
- rc=1
- ;;
- esac
- ;;
-
# texconfig dvipdfmx
dvipdfmx)
help="Usage: $progname dvipdfmx paper PAPER
@@ -1234,9 +1199,6 @@
if checkForBinary dvips >/dev/null && tcfmgr --cmd find --file config.ps >/dev/null 2>&1; then
tcBatch dvips paper $pDvips
fi
- if checkForBinary dvipdfm >/dev/null && tcfmgr --cmd find --file config >/dev/null 2>&1; then
- tcBatch dvipdfm paper $p
- fi
if checkForBinary dvipdfmx >/dev/null && tcfmgr --cmd find --file dvipdfmx.cfg >/dev/null 2>&1; then
tcBatch dvipdfmx paper $p
fi
Modified: trunk/Master/tlpkg/bin/tl-update-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlnet 2017-04-17 14:18:34 UTC (rev 43893)
+++ trunk/Master/tlpkg/bin/tl-update-tlnet 2017-04-17 15:42:57 UTC (rev 43894)
@@ -127,8 +127,9 @@
instopt_adjustrepo 0
" >texlive.profile
-# silence warnings we do not need to see.
+# silence envvar warnings and the welcome message.
TEXLIVE_INSTALL_ENV_NOCHECK=1; export TEXLIVE_INSTALL_ENV_NOCHECK
+TEXLIVE_INSTALL_NO_WELCOME=1; export TEXLIVE_INSTALL_NO_WELCOME
tlnet_install_log=`pwd`/install.log
echo "$0: Running test install (log: $tlnet_install_log)..."
@@ -164,9 +165,6 @@
| grep -Ev '^done running ' \
| grep -Ev '^finished ' \
| grep -Ev '^Welcome to TeX Live' \
- | grep -Ev '^See' \
- | grep -Ev '^ .*/index.html' \
- | grep -Ev '^for links to documentation' \
| grep -Ev '^The TeX Live web site' \
| grep -Ev '^contains updates' \
| grep -Ev '^TeX Live is a joint project of the TeX user groups' \
More information about the tex-live-commits
mailing list