[2.7] bpo-30450: Pull Windows dependencies from GitHub rather than SVN (GH-1783) #3306
Conversation
…honGH-1783) 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 51599e2)
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
…n vcvarsall.bat (python#2252) * Fixes build scripts to find msbuild.exe and stop relying on vcvarsall.bat Also fixes bdist_wininst.vcxproj to use correct version in generated name. (cherry-picked from parts of 40a23e8)
* bpo-30450: Fall back to git.exe if no Python is found. * Also check whether git.exe is on PATH if it will be used.
zware
changed the title
zooba
left a comment
zooba
left a comment
There was a problem hiding this comment.
Looks good. Thanks for grabbing the Doc/make.bat change
| "%PYTHON%" -m pip install sphinx | ||
| if errorlevel 1 exit /B | ||
| ) | ||
| ) |
There was a problem hiding this comment.
I have an open PR making this bit even better! You should review that before backporting something different :)
| <!-- Directories of external projects. tcltk is handled in tcltk.props --> | ||
| <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir> | ||
| <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> | ||
| <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir> |
There was a problem hiding this comment.
Not sure if this is a change we wanted to actually make...
There was a problem hiding this comment.
This was simpler than creating a new branch for an old version of sqlite, and @benjaminp basically approved it on IRC (you never replied :)).
Fix logic for retrying nuget.exe download with Python. Add support for HOST_PYTHON variable. Clear internal environment variables used in find_python.bat Use HOST_PYTHON as the actual Python if it is recent enough. Adds HOST_PYTHON variable to AppVeyor configuration
|
@zooba Have I missed any other PRs that affect these scripts? I just found that last one via |
|
Not yet, though I'm working on one to enable the v141 toolset and latest Win10 SDKs. Not really needed for 2.7 |
|
Ok, I'm not concerned about that for 2.7. Once CI is happy with the latest commit here, I'll go ahead and merge. |
5 participants
This also contains (partial) cherry-picks of other PRs since then.
https://bugs.python.org/issue30450