diff options
| author | Ned Deily <nad@python.org> | 2018-12-11 01:06:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 01:06:57 -0500 |
| commit | 7cf3d8e25174c8871883e42f3240fd7f01efd3a8 (patch) | |
| tree | 85dca1a64f1122b71c0bd208c9886c80511f6bb1 /Mac/BuildScript/build-installer.py | |
| parent | 3ec982640f89f6ce56dd2699a81e0bd834ae0c95 (diff) | |
| download | cpython-git-7cf3d8e25174c8871883e42f3240fd7f01efd3a8.tar.gz | |
bpo-35402: Update macOS installer to use Tcl 8.6.9 / Tk 8.6.9.1 (GH-11101)
Diffstat (limited to 'Mac/BuildScript/build-installer.py')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index d550208839..806f660bd6 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -227,9 +227,9 @@ def library_recipes(): if internalTk(): result.extend([ dict( - name="Tcl 8.6.8", - url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.8-src.tar.gz", - checksum='81656d3367af032e0ae6157eff134f89', + name="Tcl 8.6.9", + url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.9-src.tar.gz", + checksum='aa0a121d95a0e7b73a036f26028538d4', buildDir="unix", configure_pre=[ '--enable-shared', @@ -243,12 +243,9 @@ def library_recipes(): }, ), dict( - name="Tk 8.6.8", - url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz", - checksum='5e0faecba458ee1386078fb228d008ba', - patches=[ - "tk868_on_10_8_10_9.patch", - ], + name="Tk 8.6.9.1", + url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.9.1-src.tar.gz", + checksum='9efe3976468352dc894dae0c4e785a8e', buildDir="unix", configure_pre=[ '--enable-aqua', @@ -709,6 +706,7 @@ def extractArchive(builddir, archiveName): work for current Tcl and Tk source releases where the basename of the archive ends with "-src" but the uncompressed directory does not. For now, just special case Tcl and Tk tar.gz downloads. + Another special case: the tk8.6.9.1 tarball extracts to tk8.6.9. """ curdir = os.getcwd() try: @@ -718,6 +716,8 @@ def extractArchive(builddir, archiveName): if ((retval.startswith('tcl') or retval.startswith('tk')) and retval.endswith('-src')): retval = retval[:-4] + if retval == 'tk8.6.9.1': + retval = 'tk8.6.9' if os.path.exists(retval): shutil.rmtree(retval) fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r') |