Merged revisions 69415,69591,69593 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69415 | benjamin.peterson | 2009-02-07 13:08:22 -0600 (Sat, 07 Feb 2009) | 1 line
make destinsrc private
........
r69591 | martin.v.loewis | 2009-02-13 14:26:16 -0600 (Fri, 13 Feb 2009) | 1 line
Update Tix build procedure.
........
r69593 | martin.v.loewis | 2009-02-13 14:51:48 -0600 (Fri, 13 Feb 2009) | 1 line
Add optional code signing after merging.
........
diff --git a/PCbuild/build_tkinter.py b/PCbuild/build_tkinter.py
index 21e89cc..2d5797f 100644
--- a/PCbuild/build_tkinter.py
+++ b/PCbuild/build_tkinter.py
@@ -52,18 +52,18 @@
if 1:
os.chdir(os.path.join(ROOT, TK, "win"))
if clean:
- nmake("makefile.vc", "clean", TCLDIR=tcldir)
- nmake("makefile.vc", TCLDIR=tcldir, MACHINE=machine)
- nmake("makefile.vc", "install", TCLDIR=tcldir, INSTALLDIR=dest, MACHINE=machine)
+ nmake("makefile.vc", "clean", DEBUG=0, TCLDIR=tcldir)
+ nmake("makefile.vc", DEBUG=0, MACHINE=machine)
+ nmake("makefile.vc", "install", DEBUG=0, INSTALLDIR=dest, MACHINE=machine)
# TIX
if 1:
# python9.mak is available at http://svn.python.org
os.chdir(os.path.join(ROOT, TIX, "win"))
if clean:
- nmake("python9.mak", "clean")
- nmake("python9.mak", MACHINE=machine, INSTALL_DIR=dest)
- nmake("python9.mak", "install", INSTALL_DIR=dest)
+ nmake("python.mak", "clean")
+ nmake("python.mak", MACHINE=machine, INSTALL_DIR=dest)
+ nmake("python.mak", "install", INSTALL_DIR=dest)
def main():
if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "AMD64"):