diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-01-02 10:06:19 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-01-02 10:06:19 (GMT) |
| commit | 7df3b9eb15494743ace969bac23630a16c657be9 (patch) | |
| tree | 01d15ff958ead7b3b1418c8793055f3a5c52afbf /PCbuild | |
| parent | 73801ec42aeaf139e850643f92e605ca07730ebe (diff) | |
| download | cpython-7df3b9eb15494743ace969bac23630a16c657be9.zip cpython-7df3b9eb15494743ace969bac23630a16c657be9.tar.gz cpython-7df3b9eb15494743ace969bac23630a16c657be9.tar.bz2 | |
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.
........
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 | ||||
| -rw-r--r-- | PCbuild/vs9to8.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index b475e7a..1b96e35 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -50,7 +50,7 @@ /> <UserMacro Name="sqlite3Dir" - Value="$(externalsDir)\sqlite-3.5.9" + Value="$(externalsDir)\sqlite-3.6.21" /> <UserMacro Name="bz2Dir" diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 67714c0..8742b46 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -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 diff --git a/PCbuild/vs9to8.py b/PCbuild/vs9to8.py index bab3b6e..3b88a16 100644 --- a/PCbuild/vs9to8.py +++ b/PCbuild/vs9to8.py @@ -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() |