Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.6] bpo-35402: Update macOS installer to use Tcl 8.6.9 / Tk 8.6.9.1 (GH-11101) #11103

Merged
merged 1 commit into from
Dec 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bpo-35402: Update macOS installer to use Tcl 8.6.9 / Tk 8.6.9.1 (GH-1…
…1101)

(cherry picked from commit 7cf3d8e)

Co-authored-by: Ned Deily <[email protected]>
  • Loading branch information
ned-deily authored and miss-islington committed Dec 11, 2018
commit 90dc421b2c75139d09091a5fceb3920cfaafd00a
18 changes: 9 additions & 9 deletions Mac/BuildScript/build-installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,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',
Expand All @@ -239,12 +239,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',
Expand Down Expand Up @@ -706,6 +703,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:
Expand All @@ -715,6 +713,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')
Expand Down
18 changes: 0 additions & 18 deletions Mac/BuildScript/tk868_on_10_8_10_9.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update macOS installer to use Tcl/Tk 8.6.9.1.