diff options
author | 2021-02-03 09:12:52 +0200 | |
---|---|---|
committer | 2021-02-03 09:12:52 +0200 | |
commit | 461ade134195277928345558921bbc8d796fc0a8 (patch) | |
tree | 44195dadb60e945d94b66e24646890d317c35242 /pypy | |
parent | merge map-improvements (diff) | |
parent | fix Tcl/Tk 8.6 packaging on win (diff) | |
download | pypy-461ade134195277928345558921bbc8d796fc0a8.tar.gz pypy-461ade134195277928345558921bbc8d796fc0a8.tar.bz2 pypy-461ade134195277928345558921bbc8d796fc0a8.zip |
merge branch to update Tk/Tcl to 8.6 on windows
Diffstat (limited to 'pypy')
-rw-r--r-- | pypy/doc/whatsnew-head.rst | 4 | ||||
-rwxr-xr-x | pypy/tool/release/package.py | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst index d195d41f61..9f9598c2ff 100644 --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head.rst @@ -66,3 +66,7 @@ e.g. it's always constant-folded away Optimize instances with integer or float fields to have more efficent field reads and writes. They also use less memory if they have at least two such fields. + +.. branch: win-tcl8.6 + +Update the version of Tk/Tcl on windows to 8.6 diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py index cb732e5e99..458adf645e 100755 --- a/pypy/tool/release/package.py +++ b/pypy/tool/release/package.py @@ -154,7 +154,7 @@ def create_package(basedir, options, _fake=False): ('sqlite3.dll', lib_pypy)] if not options.no__tkinter: tkinter_dir = lib_pypy.join('_tkinter') - win_extras += [('tcl85.dll', tkinter_dir), ('tk85.dll', tkinter_dir)] + win_extras += [('tcl86t.dll', tkinter_dir), ('tk86t.dll', tkinter_dir)] for extra,target_dir in win_extras: p = pypy_c.dirpath().join(extra) @@ -181,15 +181,15 @@ def create_package(basedir, options, _fake=False): # library was created? if not options.no__tkinter: try: - p = pypy_c.dirpath().join('tcl85.dll') + p = pypy_c.dirpath().join('tcl86t.dll') if not p.check(): - p = py.path.local.sysfind('tcl85.dll') + p = py.path.local.sysfind('tcl86t.dll') if p is None: - raise WindowsError("tcl85.dll not found") + raise WindowsError("tcl86t.dll not found") tktcldir = p.dirpath().join('..').join('lib') shutil.copytree(str(tktcldir), str(pypydir.join('tcl'))) except WindowsError: - print("Packaging Tk runtime failed. tk85.dll and tcl85.dll " + print("Packaging Tk runtime failed. tk86t.dll and tcl86t.dll " "found in %s, expecting to find runtime in %s directory " "next to the dlls, as per build " "instructions." %(p, tktcldir), file=sys.stderr) |