summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2014-03-02 18:42:50 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2014-03-02 18:42:50 (GMT)
commita663069b5cf9d53777454e31404de51c7651a010 (patch)
treec37fc38b80e2df8b6bbfd37f59b5d27043c5b80f
parent582538bde2c212ddc40a58764a1bd4eeb54255ab (diff)
downloadcpython-a663069b5cf9d53777454e31404de51c7651a010.zip
cpython-a663069b5cf9d53777454e31404de51c7651a010.tar.gz
cpython-a663069b5cf9d53777454e31404de51c7651a010.tar.bz2
Issue #20465: Update Windows installer to SQLite 3.8.3.1.
-rw-r--r--Misc/NEWS3
-rw-r--r--PC/VS9.0/pyproject.vsprops2
-rw-r--r--PCbuild/pyproject.props2
-rw-r--r--PCbuild/readme.txt2
-rw-r--r--Tools/buildbot/external-common.bat6
5 files changed, 8 insertions, 7 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 054341d..b9c713c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,7 +25,8 @@ Build
uninstalling pip (rather than failing) if the user has updated pip to a
different version from the one bundled with ensurepip.
-- Issue #20465: Update OS X installer build to use SQLite 3.8.3.1.
+- Issue #20465: Update OS X and Windows installer builds to use
+ SQLite 3.8.3.1.
What's New in Python 3.4.0 release candidate 2?
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index ed5464d..88af242 100644
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -50,7 +50,7 @@
/>
<UserMacro
Name="sqlite3Dir"
- Value="$(externalsDir)\sqlite-3.8.1"
+ Value="$(externalsDir)\sqlite-3.8.3.1"
/>
<UserMacro
Name="bz2Dir"
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 7b65961..5f40b15 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -17,7 +17,7 @@
<PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe>
<KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe>
<externalsDir>..\..</externalsDir>
- <sqlite3Dir>$(externalsDir)\sqlite-3.8.1</sqlite3Dir>
+ <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
<opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index d5c69a7..619f6a8 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -206,7 +206,7 @@ _ssl
The ssl sub-project does not have the ability to clean the OpenSSL
build; if you need to rebuild, you'll have to clean it by hand.
_sqlite3
- Wraps SQLite 3.8.1, which is itself built by sqlite3.vcxproj
+ Wraps SQLite 3.8.3.1, which is itself built by sqlite3.vcxproj
Homepage:
http://www.sqlite.org/
_tkinter
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 244abd2..c63e889 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -37,9 +37,9 @@ if not exist tcl-8.6.1.0 (
if not exist tk-8.6.1.0 svn export http://svn.python.org/projects/external/tk-8.6.1.0
@rem sqlite3
-if not exist sqlite-3.8.1 (
- rd /s/q sqlite-source-3.7.12
- svn export http://svn.python.org/projects/external/sqlite-3.8.1
+if not exist sqlite-3.8.3.1 (
+ rd /s/q sqlite-source-3.8.1
+ svn export http://svn.python.org/projects/external/sqlite-3.8.3.1
)
@rem lzma