diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2008-06-14 11:59:52 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2008-06-14 11:59:52 (GMT) |
commit | b072cf25796e2b2bc05967d6527508e1af3eb0bb (patch) | |
tree | 2c3c2c5bdeee9e9c870a53e81063e6df497d966b /Tools/buildbot/external-amd64.bat | |
parent | 6d291c14b056257dc421a8690fe8ee817df519ea (diff) | |
download | cpython-b072cf25796e2b2bc05967d6527508e1af3eb0bb.zip cpython-b072cf25796e2b2bc05967d6527508e1af3eb0bb.tar.gz cpython-b072cf25796e2b2bc05967d6527508e1af3eb0bb.tar.bz2 |
Merged revisions 64267-64272 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64267 | amaury.forgeotdarc | 2008-06-14 09:40:32 +0200 (Sa, 14 Jun 2008) | 2 lines
Use the correct URL for sqlite3 sources, and try to fix windows buildbots.
........
r64269 | amaury.forgeotdarc | 2008-06-14 10:36:07 +0200 (Sa, 14 Jun 2008) | 3 lines
on windows, r64214 broke compilation with some recent SDKs,
because IPPROTO_IPV6 may be an enumeration member...
........
r64270 | amaury.forgeotdarc | 2008-06-14 11:44:41 +0200 (Sa, 14 Jun 2008) | 4 lines
Since python2.6 must run on Windows 2000,
explicitely disable the use of Windows XP themes when compiling tk.
This is also consistent with the WINVER=0x0500 option.
........
r64271 | martin.v.loewis | 2008-06-14 13:50:59 +0200 (Sa, 14 Jun 2008) | 3 lines
Avoid rebuilding tcl/tk.
Merge x86 changes into AMD64.
........
r64272 | martin.v.loewis | 2008-06-14 13:51:54 +0200 (Sa, 14 Jun 2008) | 2 lines
Set eol-style to CRLF for all batch files.
........
Diffstat (limited to 'Tools/buildbot/external-amd64.bat')
-rw-r--r-- | Tools/buildbot/external-amd64.bat | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat index d82f54b..c38e612 100644 --- a/Tools/buildbot/external-amd64.bat +++ b/Tools/buildbot/external-amd64.bat @@ -1,17 +1,21 @@ -@rem Fetches (and builds if necessary) external dependencies - -@rem Assume we start inside the Python source directory -call "Tools\buildbot\external-common.bat" -call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 - -if not exist tcltk64\bin\tcl85g.dll ( - cd tcl-8.5.2.1\win - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install - cd ..\.. -) - -if not exist tcltk64\bin\tk85g.dll ( - cd tk-8.5.2.1\win - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean all install - cd ..\.. -) +@rem Fetches (and builds if necessary) external dependencies
+
+@rem Assume we start inside the Python source directory
+call "Tools\buildbot\external-common.bat"
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
+
+if not exist tcltk64\bin\tcl85g.dll (
+ cd tcl-8.5.2.1\win
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
+ cd ..\..
+)
+
+if not exist tcltk64\bin\tk85g.dll (
+ cd tk-8.5.2.1\win
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 all
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 install
+ cd ..\..
+)
+
|