mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix various build problems.

This commit is contained in:
Martin v. Löwis 2010-08-28 13:06:43 +00:00
parent c8fdd10839
commit 9f59fa5d67
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PCbuild/build_tkinter.py
View File

@ -13,7 +13,7 @@
TCL = "tcl8.5.2" TCL = "tcl8.5.2"
TK = "tk8.5.2" TK = "tk8.5.2"
TIX = "tix-8.4.0.x" TIX = "tix-8.4.3.x"
ROOT = os.path.abspath(os.path.join(here, par, par)) ROOT = os.path.abspath(os.path.join(here, par, par))
# Windows 2000 compatibility: WINVER 0x0500 # Windows 2000 compatibility: WINVER 0x0500
@ -23,7 +23,7 @@
'%s %s') '%s %s')
def nmake(makefile, command="", **kw): def nmake(makefile, command="", **kw):
defines = ' '.join(k+'='+v for k, v in kw.items()) defines = ' '.join(k+'='+str(v) for k, v in kw.items())
cmd = NMAKE % (makefile, defines, command) cmd = NMAKE % (makefile, defines, command)
print("\n\n"+cmd+"\n") print("\n\n"+cmd+"\n")
if os.system(cmd) != 0: if os.system(cmd) != 0:
@ -53,8 +53,8 @@ def build(platform, clean):
os.chdir(os.path.join(ROOT, TK, "win")) os.chdir(os.path.join(ROOT, TK, "win"))
if clean: if clean:
nmake("makefile.vc", "clean", DEBUG=0, TCLDIR=tcldir) nmake("makefile.vc", "clean", DEBUG=0, TCLDIR=tcldir)
nmake("makefile.vc", DEBUG=0, MACHINE=machine) nmake("makefile.vc", DEBUG=0, MACHINE=machine, TCLDIR=tcldir)
nmake("makefile.vc", "install", DEBUG=0, INSTALLDIR=dest, MACHINE=machine) nmake("makefile.vc", "install", DEBUG=0, INSTALLDIR=dest, MACHINE=machine, TCLDIR=tcldir)
# TIX # TIX
if 1: if 1:
@ -63,7 +63,7 @@ def build(platform, clean):
if clean: if clean:
nmake("python.mak", "clean") nmake("python.mak", "clean")
nmake("python.mak", MACHINE=machine, INSTALL_DIR=dest) nmake("python.mak", MACHINE=machine, INSTALL_DIR=dest)
nmake("python.mak", "install", INSTALL_DIR=dest) nmake("python.mak", "install", MACHINE=machine, INSTALL_DIR=dest)
def main(): def main():
if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "AMD64"): if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "AMD64"):