Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 77226 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77226 | martin.v.loewis | 2010-01-02 10:25:21 +0100 (Sa, 02 Jan 2010) | 2 lines

  Update Windows build to sqlite 3.6.21.
........
This commit is contained in:
Martin v. Löwis 2010-01-02 10:06:19 +00:00
parent 73801ec42a
commit 7df3b9eb15
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -536,7 +536,7 @@ Build
- Issue #7589: Only build the nis module when the correct header files are
found.
- Switch to OpenSSL 0.9.8l on Windows.
- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows.
- Issue #5792: Extend the short float repr support to x86 systems using
icc or suncc.

2
PCbuild/pyproject.vsprops
View File

@ -50,7 +50,7 @@
/>
<UserMacro
Name="sqlite3Dir"
Value="$(externalsDir)\sqlite-3.5.9"
Value="$(externalsDir)\sqlite-3.6.21"
/>
<UserMacro
Name="bz2Dir"

2
PCbuild/readme.txt
View File

@ -104,7 +104,7 @@ winsound
Python-controlled subprojects that wrap external projects:
_sqlite3
Wraps SQLite 3.5.9, which is currently built by sqlite3.vcproj (see below).
Wraps SQLite 3.6.21, which is currently built by sqlite3.vcproj (see below).
_tkinter
Wraps the Tk windowing system. Unlike _sqlite3, there's no
corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's

2
PCbuild/vs9to8.py
View File

@ -24,7 +24,7 @@ def vs9to8(src, dest):
# Bah. VS8.0 does not expand macros in file names.
# Replace them here.
lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-3.5.9')
lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-3.6.21')
with open(destname, 'wb') as fout:
lines = lines.replace("\n", "\r\n").encode()

6
Tools/buildbot/external-common.bat
View File

@ -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.8l rd /s/q openssl-0.9.8l
@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9
@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
@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-3.5.9 (
if not exist sqlite-3.6.21 (
rd /s/q sqlite-source-3.3.4
svn export http://svn.python.org/projects/external/sqlite-3.5.9
svn export http://svn.python.org/projects/external/sqlite-3.6.21
)