summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm13
-rwxr-xr-xMaster/tlpkg/bin/tl-try-install10
-rw-r--r--Master/tlpkg/doc/releng.txt4
3 files changed, 17 insertions, 10 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index c53cf239dfb..c989cd63dee 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -309,15 +309,16 @@ sub platform_name {
if ($OS eq "darwin") {
# We have two versions of Mac binary sets.
- # 10.10/Yosemite and newer:
+ # 10.10/Yosemite and newer (Yosemite specially left over):
# -> x86_64-darwin [MacTeX]
- # 10.6/Snow Leopard through 10.9/Mavericks:
+ # 10.6/Snow Leopard through 10.10/Yosemite:
# -> x86_64-darwinlegacy if 64-bit
#
- # (BTW, uname -r numbers are larger by 4 than the minor version.
+ # (BTW, uname -r numbers are larger by 4 than the Mac minor version.
# We don't use uname numbers here.)
#
- my $mactex_darwin = 10; # the minor 10; this will change in the future.
+ # this changes each year, per above:
+ my $mactex_darwin = 10; # lowest minor rev supported by x86_64-darwin.
#
# Most robust approach is apparently to check sw_vers (os version,
# returns "10.x" values), and sysctl (processor hardware).
@@ -393,8 +394,8 @@ sub platform_desc {
'universal-darwin' => 'MacOSX universal binaries',
'win32' => 'Windows',
'x86_64-cygwin' => 'Cygwin on x86_64',
- 'x86_64-darwin' => 'MacOSX current on x86_64',
- 'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-10.9) on x86_64',
+ 'x86_64-darwin' => 'MacOSX current (10.10-) on x86_64',
+ 'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-10.10) on x86_64',
'x86_64-linux' => 'GNU/Linux on x86_64',
'x86_64-linuxmusl' => 'GNU/Linux on x86_64 with musl',
'x86_64-solaris' => 'Solaris on x86_64',
diff --git a/Master/tlpkg/bin/tl-try-install b/Master/tlpkg/bin/tl-try-install
index ca89fd7bf06..a677dbef25f 100755
--- a/Master/tlpkg/bin/tl-try-install
+++ b/Master/tlpkg/bin/tl-try-install
@@ -1,9 +1,8 @@
-#!/bin/sh
+#!/bin/sh -vx
# $Id$
# Try a TL installation with various profiles into /tmp/ki. Public domain.
renice 20 $$ >&/dev/null
-cd $HOME || exit 1 # don't let cwd interfere
instdir=/tmp/ki # in .pro files too
rm -rf $instdir* && echo "removed $instdir*."
@@ -14,11 +13,16 @@ rm -rf $instdir* && echo "removed $instdir*."
mydir=`cd \`dirname "$0"\` && pwd` # Master/tlpkg/bin
Master=`cd $mydir/../.. && pwd`
+
+# don't let cwd interfere
+cd "$HOME" || exit 1
+
+#Master=$tm #`cd $mydir/../.. && pwd`
#
thisrel=/usr/local/texlive/`date +%Y` # not necessarily, but whatever
prevrel=/usr/local/texlive/`expr "$(date +%Y)" - 1`
-pro=--profile=$Master/tlpkg/dev/profiles/TLinfra.pro #infra min small ...
+pro=--profile=$Master/tlpkg/dev/profiles/TLinfra.pro #infra min small ... full
exec time $Master/install-tl $pro
exec time $lp/install-tl $pro
exec time $lp/install-tl $pro --repo ftp://ftp.cstug.cz/pub/tex/local/tlpretest
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 3b7df863a72..333e632c884 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -166,7 +166,9 @@ M. As work proceeds, update the doc:
MetaPost (in texmf-dist), other engine (in source) NEWS.
Ensure all engine manuals updated in texmf-dist.
Update texlive-en.tex (+ .pdf, .html), tell tldoc to translate.
- Don't neglect to update "Builders of the binaries".
+ Update year numbers by one, write news section,
+ update "Builders of the binaries" and "Translators of this manual",
+ and changes throughout if behavior has changed.
Update tlbuild.texi, including make tlbuild-incl.texi.
Consider updates of core man pages in Build/source/texk/web2c/man.
Remake updmap,fmtutil man pages with help2man: