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-common.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-common.bat')
| -rw-r--r-- | Tools/buildbot/external-common.bat | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index 80316be..edcc82d 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -15,7 +15,7 @@ cd .. @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20
@rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g
-@rem if exist sqlite-source-3.5.9 rd /s/q sqlite-source-3.5.9
+@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9
@rem bzip
if not exist bzip2-1.0.5 (
@@ -37,7 +37,7 @@ if not exist tcl-8.5.2.1 ( if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0
@rem sqlite3
-if not exist sqlite-source-3.5.9 (
+if not exist sqlite-3.5.9 (
rd /s/q sqlite-source-3.3.4
- svn export http://svn.python.org/projects/external/sqlite-source-3.5.9
+ svn export http://svn.python.org/projects/external/sqlite-3.5.9
)
|