summaryrefslogtreecommitdiff
path: root/PC
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2017-09-04 16:05:33 -0700
committerGitHub <noreply@github.com>2017-09-04 16:05:33 -0700
commit986b7ffc650919b3022ccaa458a843bb8a95d2bd (patch)
treeae11e6a4adba4d2dee99986e6c7af1d0f4dcbc47 /PC
parent57d963b0b559078ca419811d0d25fea27d42f30c (diff)
downloadcpython-git-986b7ffc650919b3022ccaa458a843bb8a95d2bd.tar.gz
[2.7] bpo-30450: Pull Windows dependencies from GitHub rather than SVN (GH-1783) (GH-3306)
The Windows build now depends on Python 3.6 to fetch externals, but it will be downloaded via NuGet (which is downloaded via PowerShell) if it is not available via `py -3.6`. This means the only thing that must be installed on a modern Windows box to do a full build of CPython with all extensions is Visual Studio. Cherry-picked from 51599e2bdd10ab77212a7cbb41a13ea70ee13da8, parts of 40a23e88994aca92c83c8e84ab8b8cdc11d7ec54, parts of 68d663cf85d1ac5eaf83482eed39c0a6f8093601, d5cd21d75a27a377f2f9c8370fd8e8c7efaeefb1, and possibly others that I've missed. Also: * Rename db -> bsddb for disambiguity * Update sqlite3 to 3.14.2.0 since it's the version we use on 3.x, and it's simpler to just use it than to also upload the old version to cpython-source-deps * Add PCbuild/*.ilk to .gitignore
Diffstat (limited to 'PC')
-rw-r--r--PC/VS9.0/pyproject.vsprops4
1 files changed, 2 insertions, 2 deletions
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index 44b4f5317e..d4ced7bbf6 100644
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -50,7 +50,7 @@
/>
<UserMacro
Name="bsddb47Dir"
- Value="$(externalsDir)\db-4.7.25.0\build_windows"
+ Value="$(externalsDir)\bsddb-4.7.25.0\build_windows"
/>
<UserMacro
Name="bsddb47DepLibs"
@@ -74,7 +74,7 @@
/>
<UserMacro
Name="sqlite3Dir"
- Value="$(externalsDir)\sqlite-3.8.11.0"
+ Value="$(externalsDir)\sqlite-3.14.2.0"
/>
<UserMacro
Name="bz2Dir"