Commit d0d09b51 authored by Ned Deily's avatar Ned Deily Committed by GitHub

[2.7] bpo-15663: the 10.6+ macOS installers for 3.6/2.7 now provide a private Tcl/Tk 8.6 (GH-11110)

parent aa580508
......@@ -2,6 +2,8 @@
"""
This script is used to build "official" universal installers on macOS.
NEW for 3.6.8 / 2.7.16:
- also build and use Tk 8.6 for 10.6+ installers
NEW for 3.6.5:
- support Intel 64-bit-only () and 32-bit-only installer builds
- build and link with private Tcl/Tk 8.6 for 10.9+ builds
......@@ -20,8 +22,8 @@ Sphinx and dependencies are installed into a venv using the python3's pip
so will fetch them from PyPI if necessary. Since python3 is now used for
Sphinx, build-installer.py should also be converted to use python3!
For 10.9 or greater deployment targets, build-installer builds and links
with its own copy of Tcl/Tk 8.5 and the rest of this paragraph does not
For 10.6 or greater deployment targets, build-installer builds and links
with its own copy of Tcl/Tk 8.6 and the rest of this paragraph does not
apply. Otherwise, build-installer requires an installed third-party version
of Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) or Tcl/TK 8.5
(for 10.6 or later) installed in /Library/Frameworks. When installed,
......@@ -188,9 +190,9 @@ USAGE = textwrap.dedent("""\
EXPECTED_SHARED_LIBS = {}
# Are we building and linking with our own copy of Tcl/TK?
# For now, do so if deployment target is 10.9+.
# For now, do so if deployment target is 10.6+.
def internalTk():
return getDeptargetTuple() >= (10, 9)
return getDeptargetTuple() >= (10, 6)
# List of names of third party software built with this installer.
# The names will be inserted into the rtf version of the License.
......
This diff is collapsed.
{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf400
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf100
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fmodern\fcharset0 CourierNewPSMT;
}
{\colortbl;\red255\green255\blue255;}
{\*\expandedcolortbl;;}
\paperw11905\paperh16837\margl1440\margr1440\vieww13360\viewh10920\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
\f0\fs24 \cf0 This package will install
\b Python $FULL_VERSION
\b0 for
\b macOS $MACOSX_DEPLOYMENT_TARGET
\b0 .\
\f1\b Python $FULL_VERSION
\f0\b0 for
\f1\b macOS $MACOSX_DEPLOYMENT_TARGET
\f0\b0 .\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
\cf0 \
\b Python for macOS
\b0 consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for macOS users including an integrated development environment
\b IDLE
\b0 .\
\f1\b Python for macOS
\f0\b0 consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for macOS users including an integrated development environment
\f1\b IDLE
\f0\b0 .\
\
\b NEW in 2.7.15:
\b0 two installer variants (10.9+ 64-bit-only, 10.6+ 64-/32-bit), built-in Tcl/Tk 8.6 support in the 10.9+ variant (no additional third-party downloads!), updated
\f1 pip,
\f1\b NEW in 2.7.15:
\f0\b0 two installer variants (10.9+ 64-bit-only, 10.6+ 64-/32-bit), built-in Tcl/Tk 8.6 support in the 10.9+ variant (no additional third-party downloads!), updated
\f2 pip,
\f0 built-in OpenSSL 1.0.2 (click on
\f1 Install Certificates
\f2 Install Certificates
\f0 for root certificates)\
\
\f1\b CHANGED in 2.7.16:
\f0\b0 the 10.6+ variant now also uses a built-in Tcl/Tk 8.6\
}
\ No newline at end of file
The macOS 10.6+ installer now provides a private copy of Tcl/Tk 8.6, like
the 10.9+ installer does.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment