diff options
author | Christian Heimes <christian@cheimes.de> | 2007-12-19 02:07:34 (GMT) |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2007-12-19 02:07:34 (GMT) |
commit | 99170a5dbf4cfee78b578672b6821e855f92594b (patch) | |
tree | 06892b1118241d608a9ff6893736d7ea619443bd /PCbuild9/build_tkinter.py | |
parent | 2c1816160639f00489aa8bac6178e44bb51e7adb (diff) | |
download | cpython-99170a5dbf4cfee78b578672b6821e855f92594b.zip cpython-99170a5dbf4cfee78b578672b6821e855f92594b.tar.gz cpython-99170a5dbf4cfee78b578672b6821e855f92594b.tar.bz2 |
Merged revisions 59541-59561 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59544 | raymond.hettinger | 2007-12-18 01:13:45 +0100 (Tue, 18 Dec 2007) | 1 line
Add more namedtuple() test cases. Neaten the code and comments.
........
r59545 | christian.heimes | 2007-12-18 04:38:03 +0100 (Tue, 18 Dec 2007) | 3 lines
Fixed for #1601: IDLE not working correctly on Windows (Py30a2/IDLE30a1)
Amaury's ideas works great. Should we build the Python core with WINVER=0x0500 and _WIN32_WINNT=0x0500, too?
........
r59546 | christian.heimes | 2007-12-18 10:00:13 +0100 (Tue, 18 Dec 2007) | 1 line
Make it a bit easier to test Tcl/Tk and idle from a build dir.
........
r59547 | christian.heimes | 2007-12-18 10:12:10 +0100 (Tue, 18 Dec 2007) | 1 line
Removed several unused files from the PCbuild9 directory. They are relics from the past.
........
r59548 | raymond.hettinger | 2007-12-18 19:26:18 +0100 (Tue, 18 Dec 2007) | 29 lines
Speed-up dictionary constructor by about 10%.
New opcode, STORE_MAP saves the compiler from awkward stack manipulations
and specializes for dicts using PyDict_SetItem instead of PyObject_SetItem.
Old disassembly:
0 BUILD_MAP 0
3 DUP_TOP
4 LOAD_CONST 1 (1)
7 ROT_TWO
8 LOAD_CONST 2 ('x')
11 STORE_SUBSCR
12 DUP_TOP
13 LOAD_CONST 3 (2)
16 ROT_TWO
17 LOAD_CONST 4 ('y')
20 STORE_SUBSCR
New disassembly:
0 BUILD_MAP 0
3 LOAD_CONST 1 (1)
6 LOAD_CONST 2 ('x')
9 STORE_MAP
10 LOAD_CONST 3 (2)
13 LOAD_CONST 4 ('y')
16 STORE_MAP
........
r59549 | thomas.heller | 2007-12-18 20:00:34 +0100 (Tue, 18 Dec 2007) | 2 lines
Issue #1642: Fix segfault in ctypes when trying to delete attributes.
........
r59551 | guido.van.rossum | 2007-12-18 21:10:42 +0100 (Tue, 18 Dec 2007) | 2 lines
Issue #1645 by Alberto Bertogli. Fix a comment.
........
r59553 | raymond.hettinger | 2007-12-18 22:24:09 +0100 (Tue, 18 Dec 2007) | 12 lines
Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary.
Allows dictionaries to be pre-sized (upto 255 elements) saving time lost
to re-sizes with their attendant mallocs and re-insertions.
Has zero effect on small dictionaries (5 elements or fewer), a slight
benefit for dicts upto 22 elements (because they had to resize once
anyway), and more benefit for dicts upto 255 elements (saving multiple
resizes during the build-up and reducing the number of collisions on
the first insertions). Beyond 255 elements, there is no addional benefit.
........
r59554 | christian.heimes | 2007-12-18 22:56:09 +0100 (Tue, 18 Dec 2007) | 1 line
Fixed #1649: IDLE error: dictionary changed size during iteration
........
r59557 | raymond.hettinger | 2007-12-18 23:21:27 +0100 (Tue, 18 Dec 2007) | 1 line
Simplify and speedup _asdict() for named tuples.
........
r59558 | christian.heimes | 2007-12-19 00:22:54 +0100 (Wed, 19 Dec 2007) | 3 lines
Applied patch #1635: Float patch for inf and nan on Windows (and other platforms).
The patch unifies float("inf") and repr(float("inf")) on all platforms.
........
r59559 | raymond.hettinger | 2007-12-19 00:51:15 +0100 (Wed, 19 Dec 2007) | 1 line
Users demand iterable input for named tuples. The author capitulates.
........
r59560 | raymond.hettinger | 2007-12-19 01:21:06 +0100 (Wed, 19 Dec 2007) | 1 line
Beef-up tests for dict literals
........
r59561 | raymond.hettinger | 2007-12-19 01:27:21 +0100 (Wed, 19 Dec 2007) | 1 line
Zap a duplicate line
........
Diffstat (limited to 'PCbuild9/build_tkinter.py')
-rw-r--r-- | PCbuild9/build_tkinter.py | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/PCbuild9/build_tkinter.py b/PCbuild9/build_tkinter.py index 3e24d00..dada386 100644 --- a/PCbuild9/build_tkinter.py +++ b/PCbuild9/build_tkinter.py @@ -12,14 +12,24 @@ import shutil here = os.path.abspath(os.path.dirname(__file__)) par = os.path.pardir -TCL = "tcl8.4.16" -TK = "tk8.4.16" -TIX = "tix-8.4.0" -#TIX = "Tix8.4.2" -ROOT = os.path.abspath(os.path.join(here, par, par)) -NMAKE = "nmake /nologo " +if 1: + TCL = "tcl8.4.16" + TK = "tk8.4.16" + TIX = "tix-8.4.0" +else: + TCL = "tcl8.5b3" + TK = "tcl8.5b3" + TIX = "Tix8.4.2" -def system(cmd): +ROOT = os.path.abspath(os.path.join(here, par, par)) +# Windows 2000 compatibility: WINVER 0x0500 +# http://msdn2.microsoft.com/en-us/library/aa383745.aspx +NMAKE = "nmake /nologo /f %s COMPILERFLAGS=-DWINVER=0x0500 %s %s" + +def nmake(makefile, command="", **kw): + defines = ' '.join(k+'='+v for k, v in kw.items()) + cmd = NMAKE % (makefile, defines, command) + print("\n\n"+cmd+"\n") if os.system(cmd) != 0: raise RuntimeError(cmd) @@ -35,31 +45,29 @@ def build(platform, clean): # TCL tcldir = os.path.join(ROOT, TCL) - if True: + if 1: os.chdir(os.path.join(tcldir, "win")) if clean: - system(NMAKE + "/f makefile.vc clean") - system(NMAKE + "/f makefile.vc") - system(NMAKE + "/f makefile.vc INSTALLDIR=%s install" % dest) + nmake("makefile.vc", "clean") + nmake("makefile.vc") + nmake("makefile.vc", "install", INSTALLDIR=dest) # TK - if True: + if 1: os.chdir(os.path.join(ROOT, TK, "win")) if clean: - system(NMAKE + "/f makefile.vc clean") - system(NMAKE + "/f makefile.vc TCLDIR=%s" % tcldir) - system(NMAKE + "/f makefile.vc TCLDIR=%s INSTALLDIR=%s install" % - (tcldir, dest)) + nmake("makefile.vc", "clean", TCLDIR=tcldir) + nmake("makefile.vc", TCLDIR=tcldir) + nmake("makefile.vc", "install", TCLDIR=tcldir, INSTALLDIR=dest) # TIX - if True: + if 1: # python9.mak is available at http://svn.python.org os.chdir(os.path.join(ROOT, TIX, "win")) if clean: - system(NMAKE + "/f python9.mak clean") - system(NMAKE + "/f python9.mak MACHINE=%s" % machine) - system(NMAKE + "/f python9.mak install") - + nmake("python9.mak", "clean") + nmake("python9.mak", MACHINE=machine) + nmake("python9.mak", "install") def main(): if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "x64"): |