mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update Windows build to sqlite 3.6.21.

Browse source
This commit is contained in:
Martin v. Löwis 2010-01-02 09:25:21 +00:00
parent 1a635e4663
commit f477b93d9d
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -121,7 +121,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 #7541: when using ``python-config`` with a framework install the compiler might
use the wrong library.

2
PCbuild/pyproject.vsprops
View file

@ -74,7 +74,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

@ -107,7 +107,7 @@ _bsddb
Wraps Berkeley DB 4.7.25, which is currently built by _bsddb.vcproj.
project (see below).
_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 _bsddb and _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')
lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.7.25.0\\build_windows\\..')
lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.7.25.0\\build_windows')

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

@ -16,7 +16,7 @@ cd ..
@rem if exist db-4.4.20 rd /s/q db-4.4.20
@rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0
@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 (
@ -39,7 +39,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
)