Skip to content

[2.7] bpo-30450: Pull Windows dependencies from GitHub rather than SVN (GH-1783) #3306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zware merged 10 commits into from
Sep 4, 2017
Merged

[2.7] bpo-30450: Pull Windows dependencies from GitHub rather than SVN (GH-1783) #3306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8bff83d
bpo-30450: Pull Windows dependencies from GitHub rather than svn (GH-…
zware Jun 16, 2017
3d6896b
Rename db -> bsddb for disambiguity
zware Sep 4, 2017
3e9dc95
Update sqlite3 to 3.14.2.0
zware Sep 4, 2017
91f23be
bpo-30687: Fixes build scripts to find msbuild.exe and stop relying o…
zooba Jun 19, 2017
f4072f7
Add PCbuild/*.ilk to .gitignore
zware Sep 4, 2017
1441663
Cherry-pick parts of 68d663cf85d1ac5eaf83482eed39c0a6f8093601
zooba Jul 17, 2017
6890ac3
bpo-30450: Fall back to git.exe if no Python is found. (#2739)
zooba Jul 17, 2017
3db3ecd
Add NEWS blurb
zware Sep 4, 2017
90f361c
Fixes doc/make.bat to properly handle quoted paths.
zooba Sep 4, 2017
e3c9556
bpo-30450: Fix logic for retrying nuget.exe download (#2744)
zooba Jul 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename db -> bsddb for disambiguity
  • Loading branch information
@zware
zware committed Sep 4, 2017
commit 3d6896b1b01f406a121f020405f33b7c7d10b62d
2 changes: 1 addition & 1 deletion PC/VS9.0/pyproject.vsprops
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ rem files in both this dir and PC\VS9.0

set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% bsddb-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k
set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/python.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
<bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
Expand Down