diff options
author | Ned Deily <nad@python.org> | 2018-12-11 09:33:56 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-11 09:33:56 (GMT) |
commit | d0d09b511d7a438fb18a9a4703480763119b4eac (patch) | |
tree | aafad14e8999dcda4e873c90921c0274b1747324 /Mac/BuildScript/build-installer.py | |
parent | aa580508431d231677cfaa13ac9b6aa37538b9ef (diff) | |
download | cpython-d0d09b511d7a438fb18a9a4703480763119b4eac.zip cpython-d0d09b511d7a438fb18a9a4703480763119b4eac.tar.gz cpython-d0d09b511d7a438fb18a9a4703480763119b4eac.tar.bz2 |
[2.7] bpo-15663: the 10.6+ macOS installers for 3.6/2.7 now provide a private Tcl/Tk 8.6 (GH-11110)
Diffstat (limited to 'Mac/BuildScript/build-installer.py')
-rwxr-xr-x | Mac/BuildScript/build-installer.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 48c4e5c..b1dede4 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -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. |