summaryrefslogtreecommitdiffstats
path: root/Tools/buildbot/external.bat
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-05-13 16:19:23 (GMT)
committerBrian Curtin <brian@python.org>2012-05-13 16:19:23 (GMT)
commit401f9f3d32dcebf5ead8079d46a83fe7c7631581 (patch)
tree899600f4dad86565fd3585499e2332d2a3599d42 /Tools/buildbot/external.bat
parent708d88c33441b29760b9246d61844eb59c1d0f3a (diff)
downloadcpython-401f9f3d32dcebf5ead8079d46a83fe7c7631581.zip
cpython-401f9f3d32dcebf5ead8079d46a83fe7c7631581.tar.gz
cpython-401f9f3d32dcebf5ead8079d46a83fe7c7631581.tar.bz2
Fix #13210. Port the Windows build from VS2008 to VS2010.
Diffstat (limited to 'Tools/buildbot/external.bat')
-rw-r--r--Tools/buildbot/external.bat12
1 files changed, 6 insertions, 6 deletions
diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index e958fd6..ed5c10e 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -2,20 +2,20 @@
@rem Assume we start inside the Python source directory
call "Tools\buildbot\external-common.bat"
-call "%VS90COMNTOOLS%\vsvars32.bat"
+call "%VS100COMNTOOLS%\vsvars32.bat"
if not exist tcltk\bin\tcl85g.dll (
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
- cd tcl-8.5.9.0\win
+ cd tcl-8.5.11.0\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all
nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install
cd ..\..
)
if not exist tcltk\bin\tk85g.dll (
- cd tk-8.5.9.0\win
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 clean
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 all
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 install
+ cd tk-8.5.11.0\win
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 clean
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 all
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 install
cd ..\..
)