8000 bpo-32726: macOS 10.6+ installer now builds Tcl/TK 8.6 (GH-6308) · python/cpython@7a6f59e · GitHub
[go: up one dir, main page]
Skip to content
/ cpython Public

Commit 7a6f59e

Browse files
ned-deilyned-deily
authored
bpo-32726: macOS 10.6+ installer now builds Tcl/TK 8.6 (GH-6308)
Build and link with private copy of Tcl/Tk 8.6 for the macOS 10.6+ installer. The 10.9+ installer variant already does this. This means that the Python 3.7 provided by the python.org macOS installers no longer need or use any external versions of Tcl/Tk, either system-provided or user- installed, such as ActiveTcl.
1 parent a470b74 commit 7a6f59e

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

‎Mac/BuildScript/build-installer.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
NEW for 3.7.0:
66
- support Intel 64-bit-only () and 32-bit-only installer builds
7-
- use external Tcl/Tk 8.6 for 10.9+ builds
7+
- build and use internal Tcl/Tk 8.6 for 10.6+ builds
88
- deprecate use of explicit SDK (--sdk-path=) since all but the oldest
99
versions of Xcode support implicit setting of an SDK via environment
1010
variables (SDKROOT and friends, see the xcrun man page for more info).
@@ -24,7 +24,9 @@
2424
so will fetch them from PyPI if necessary. Since python3 is now used for
2525
Sphinx, build-installer.py should also be converted to use python3!
2626
27-
build-installer currently requires an installed third-party version of
27+
For 3.7.0, when building for a 10.6 or higher deployment target,
28+
build-installer builds and links with its own copy of Tcl/Tk 8.6.
29+
Otherwise, it requires an installed third-party version of
2830
Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets), Tcl/TK 8.5
2931
(for 10.6 or later), or Tcl/TK 8.6 (for 10.9 or later)
3032
installed in /Library/Frameworks. When installed,
@@ -190,9 +192,9 @@ def getTargetCompilers():
190192
EXPECTED_SHARED_LIBS = {}
191193

192194
# Are we building and linking with our own copy of Tcl/TK?
193-
# For now, do so if deployment target is 10.9+.
195+
# For now, do so if deployment target is 10.6+.
194196
def internalTk():
195-
return getDeptargetTuple() >= (10, 9)
197+
return getDeptargetTuple() >= (10, 6)
196198

197199
# List of names of third party software built with this installer.
198200
# The names will be inserted into the rtf version of the License.

‎Mac/BuildScript/resources/ReadMe.rtf

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,10 @@ The bundled
5353
\f0 included with this installer has its own default certificate store for verifying download connections.\
5454
\
5555

56-
\b \ul Using IDLE or other Tk applications [NEW/CHANGED in 3.7.0b1]
56+
\b \ul Using IDLE or other Tk applications [NEW/CHANGED in 3.7.0b3]
5757
\b0 \ulnone \
5858
\
59-
The 10.9+ installer variant comes with its own private version of Tcl/Tk 8.6. It does not use system-supplied or third-party supplied versions of Tcl/Tk.\
60-
\
61-
For the 10.6+ variant, you continue to need to install a newer third-party version of the
62-
\i Tcl/Tk
63-
\i0 8.5 (not 8.6) frameworks to use IDLE or other programs that use the Tkinter graphical user interface toolkit. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information about supported and recommended versions of
64-
\i Tcl/Tk
65-
\i0 for this version of Python and of macOS.\
59+
Both installer variants come with their own private version of Tcl/Tk 8.6. They no longer use system-supplied or third-party supplied versions of Tcl/Tk.\
6660

6761
\b \ul \
6862
Other changes\

‎Mac/BuildScript/resources/Welcome.rtf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
\
2424

2525
\b NEW in 3.7.0b1:
26-
\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!), OpenSSL 1.1.0g, and more!\
26+
\b0 two installer variants (10.9+ 64-bit-only, 10.6+ 64-/32-bit), built-in Tcl/Tk 8.6 support (no additional third-party downloads!), OpenSSL 1.1.0g, and more!\
2727
}

‎Misc/NEWS.d/next/macOS/2018-03-29-06-56-12.bpo-32726.urS9uX.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Build and link with private copy of Tcl/Tk 8.6 for the macOS 10.6+
2+
installer. The 10.9+ installer variant already does this. This means that
3+
the Python 3.7 provided by the python.org macOS installers no longer need or
4+
use any external versions of Tcl/Tk, either system-provided or user-
5+
installed, such as ActiveTcl.

0 commit comments

Comments
 (0)
0