Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(2)

#22919: Update PCBuild for VS 2015

Can't Edit
Can't Publish+Mail
Start Review
Created:
5 years, 3 months ago by steve.dower
Modified:
5 years, 2 months ago
Reviewers:
zachary.ware, pitrou
CC:
AntoinePitrou, haypo, tim.golden, jkloth, trent, BreamoreBoy, devnull_psf.upfronthosting.co.za, Zach Ware, mdengler, steve.dower, thefriendlycoder_gmail.com
Visibility:
Public.

Patch Set 1 #

Total comments: 30

Patch Set 2 #

Total comments: 41

Patch Set 3 #

Total comments: 12

Patch Set 4 #

Patch Set 5 #

Total comments: 8
Unified diffs Side-by-side diffs Delta from patch set Stats Patch
.gitignore View 1 2 3 4 3 chunks +17 lines, -11 lines 0 comments Download
.hgignore View 1 2 3 4 3 chunks +5 lines, -13 lines 0 comments Download
Lib/ctypes/util.py View 1 2 3 4 2 chunks +5 lines, -1 line 0 comments Download
Lib/distutils/command/build_ext.py View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
Lib/distutils/msvc9compiler.py View 1 2 3 4 1 chunk +3 lines, -0 lines 0 comments Download
Lib/distutils/msvccompiler.py View 1 2 3 4 1 chunk +3 lines, -0 lines 2 comments Download
Lib/distutils/sysconfig.py View 1 2 3 4 4 chunks +8 lines, -17 lines 2 comments Download
Lib/sysconfig.py View 1 2 3 4 2 chunks +4 lines, -11 lines 2 comments Download
Misc/NEWS View 1 2 3 4 1 chunk +5 lines, -0 lines 0 comments Download
Modules/posixmodule.c View 1 2 3 4 1 chunk +20 lines, -2 lines 0 comments Download
Modules/socketmodule.c View 1 2 3 4 2 chunks +10 lines, -1 line 0 comments Download
Modules/timemodule.c View 1 2 3 4 2 chunks +0 lines, -13 lines 0 comments Download
PC/bdist_wininst/archive.h View 1 2 3 4 1 chunk +4 lines, -5 lines 0 comments Download
PC/bdist_wininst/extract.c View 1 2 3 4 1 chunk +4 lines, -5 lines 0 comments Download
PC/bdist_wininst/install.c View 1 2 3 4 8 chunks +10 lines, -28 lines 0 comments Download
PC/bdist_wininst/install.rc View 1 2 3 4 1 chunk +4 lines, -5 lines 0 comments Download
PC/bdist_wininst/resource.h View 1 2 3 4 1 chunk +4 lines, -5 lines 0 comments Download
PCbuild/bdist_wininst.vcxproj View 1 2 3 4 3 chunks +38 lines, -93 lines 0 comments Download
PCbuild/build.bat View 1 2 3 4 1 chunk +11 lines, -2 lines 0 comments Download
PCbuild/build_pgo.bat View 1 2 3 4 2 chunks +12 lines, -12 lines 0 comments Download
PCbuild/_bz2.vcxproj View 1 2 3 4 2 chunks +9 lines, -175 lines 0 comments Download
PCbuild/clean.bat View 1 2 3 4 1 chunk +5 lines, -0 lines 0 comments Download
PCbuild/_ctypes_test.vcxproj View 1 2 3 4 1 chunk +8 lines, -123 lines 0 comments Download
PCbuild/_ctypes.vcxproj View 1 2 3 4 2 chunks +12 lines, -199 lines 0 comments Download
PCbuild/debug.props View 1 2 3 4 1 chunk +0 lines, -31 lines 0 comments Download
PCbuild/_decimal.vcxproj View 1 2 3 4 2 chunks +14 lines, -198 lines 0 comments Download
PCbuild/_elementtree.vcxproj View 1 2 3 4 2 chunks +8 lines, -175 lines 0 comments Download
PCbuild/env.bat View 1 2 3 4 1 chunk +13 lines, -2 lines 0 comments Download
PCbuild/_freeze_importlib.vcxproj View 1 2 3 4 3 chunks +43 lines, -126 lines 0 comments Download
PCbuild/_hashlib.vcxproj View 1 2 3 4 1 chunk +15 lines, -207 lines 0 comments Download
PCbuild/idle.bat View 1 2 3 4 1 chunk +3 lines, -3 lines 0 comments Download
PCbuild/kill_python.c View 1 2 3 4 1 chunk +0 lines, -178 lines 0 comments Download
PCbuild/kill_python.vcxproj View 1 2 3 4 1 chunk +0 lines, -120 lines 0 comments Download
PCbuild/kill_python.vcxproj.filters View 1 2 3 4 1 chunk +0 lines, -13 lines 0 comments Download
PCbuild/libeay.vcxproj View 1 2 3 4 1 chunk +892 lines, -0 lines 0 comments Download
PCbuild/_lzma.vcxproj View 1 2 3 4 1 chunk +12 lines, -177 lines 0 comments Download
PCbuild/make_buildinfo.c View 1 2 3 4 1 chunk +0 lines, -194 lines 0 comments Download
PCbuild/make_buildinfo.vcxproj View 1 2 3 4 1 chunk +0 lines, -52 lines 0 comments Download
PCbuild/make_buildinfo.vcxproj.filters View 1 2 3 4 1 chunk +0 lines, -14 lines 0 comments Download
PCbuild/make_versioninfo.vcxproj View 1 2 3 4 1 chunk +0 lines, -200 lines 0 comments Download
PCbuild/make_versioninfo.vcxproj.filters View 1 2 3 4 1 chunk +0 lines, -13 lines 0 comments Download
PCbuild/_msi.vcxproj View 1 2 3 4 1 chunk +9 lines, -155 lines 0 comments Download
PCbuild/_multiprocessing.vcxproj View 1 2 3 4 1 chunk +8 lines, -154 lines 0 comments Download
PCbuild/openssl.props View 1 2 3 4 1 chunk +67 lines, -0 lines 0 comments Download
PCbuild/_overlapped.vcxproj View 1 2 3 4 1 chunk +8 lines, -162 lines 0 comments Download
PCbuild/pcbuild.proj View 1 2 3 4 1 chunk +86 lines, -0 lines 0 comments Download
PCbuild/pcbuild.sln View 1 2 3 4 14 chunks +134 lines, -163 lines 0 comments Download
PCbuild/pginstrument.props View 1 2 3 4 1 chunk +0 lines, -38 lines 0 comments Download
PCbuild/pgupdate.props View 1 2 3 4 1 chunk +0 lines, -17 lines 0 comments Download
PCbuild/pyd_d.props View 1 2 3 4 1 chunk +0 lines, -31 lines 0 comments Download
PCbuild/pyd.props View 1 2 3 4 1 chunk +0 lines, -25 lines 0 comments Download
PCbuild/pyexpat.vcxproj View 1 2 3 4 1 chunk +10 lines, -163 lines 0 comments Download
PCbuild/pylauncher.vcxproj View 1 2 3 4 2 chunks +10 lines, -239 lines 0 comments Download
PCbuild/pyproject.props View 1 2 3 4 2 chunks +112 lines, -72 lines 0 comments Download
PCbuild/python3dll.vcxproj View 1 2 3 4 3 chunks +53 lines, -124 lines 0 comments Download
PCbuild/pythoncore.vcxproj View 1 2 3 4 2 chunks +38 lines, -394 lines 0 comments Download
PCbuild/python.props View 1 2 3 4 1 chunk +108 lines, -0 lines 0 comments Download
PCbuild/python.vcxproj View 1 2 3 4 3 chunks +20 lines, -442 lines 0 comments Download
PCbuild/pythonw.vcxproj View 1 2 3 4 1 chunk +6 lines, -272 lines 0 comments Download
PCbuild/pywlauncher.vcxproj View 1 2 3 4 2 chunks +10 lines, -179 lines 0 comments Download
PCbuild/readme.txt View 1 2 3 4 12 chunks +61 lines, -85 lines 0 comments Download
PCbuild/release.props View 1 2 3 4 1 chunk +0 lines, -23 lines 0 comments Download
PCbuild/rt.bat View 1 2 3 4 2 chunks +2 lines, -2 lines 2 comments Download
PCbuild/select.vcxproj View 1 2 3 4 1 chunk +8 lines, -163 lines 0 comments Download
PCbuild/_socket.vcxproj View 1 2 3 4 1 chunk +8 lines, -154 lines 0 comments Download
PCbuild/sqlite3.props View 1 2 3 4 1 chunk +0 lines, -16 lines 0 comments Download
PCbuild/_sqlite3.vcxproj View 1 2 3 4 2 chunks +8 lines, -175 lines 0 comments Download
PCbuild/sqlite3.vcxproj View 1 2 3 4 2 chunks +9 lines, -172 lines 0 comments Download
PCbuild/ssleay.vcxproj View 1 2 3 4 1 chunk +121 lines, -0 lines 0 comments Download
PCbuild/_ssl.vcxproj View 1 2 3 4 1 chunk +15 lines, -207 lines 0 comments Download
PCbuild/ssl.vcxproj View 1 2 3 4 1 chunk +0 lines, -251 lines 0 comments Download
PCbuild/tcltk.props View 1 2 3 4 1 chunk +41 lines, -26 lines 0 comments Download
PCbuild/tcl.vcxproj View 1 2 3 4 3 chunks +50 lines, -135 lines 0 comments Download
PCbuild/_testbuffer.vcxproj View 1 2 3 4 1 chunk +9 lines, -147 lines 0 comments Download
PCbuild/_testcapi.vcxproj View 1 2 3 4 1 chunk +9 lines, -147 lines 0 comments Download
PCbuild/_testembed.vcxproj View 1 2 3 4 3 chunks +23 lines, -107 lines 0 comments Download
PCbuild/_testimportmultiple.vcxproj View 1 2 3 4 1 chunk +9 lines, -147 lines 0 comments Download
PCbuild/tix.vcxproj View 1 2 3 4 3 chunks +46 lines, -123 lines 0 comments Download
PCbuild/_tkinter.vcxproj View 1 2 3 4 1 chunk +8 lines, -183 lines 0 comments Download
PCbuild/tk.vcxproj View 1 2 3 4 3 chunks +50 lines, -133 lines 0 comments Download
PCbuild/unicodedata.vcxproj View 1 2 3 4 1 chunk +8 lines, -147 lines 0 comments Download
PCbuild/vs9to10.py View 1 2 3 4 1 chunk +0 lines, -56 lines 0 comments Download
PCbuild/vs9to8.py View 1 2 3 4 1 chunk +0 lines, -34 lines 0 comments Download
PCbuild/winsound.vcxproj View 1 2 3 4 1 chunk +8 lines, -147 lines 0 comments Download
PCbuild/x64.props View 1 2 3 4 1 chunk +0 lines, -26 lines 0 comments Download
PCbuild/xxlimited.vcxproj View 1 2 3 4 2 chunks +23 lines, -129 lines 0 comments Download
PC/pyconfig.h View 1 2 3 4 1 chunk +7 lines, -0 lines 0 comments Download
PC/pylauncher.rc View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
PC/python35gen.py View 1 2 3 4 1 chunk +0 lines, -26 lines 0 comments Download
PC/python35stub.def View 1 2 3 4 1 chunk +0 lines, -701 lines 0 comments Download
PC/python3.def View 1 2 3 4 1 chunk +2 lines, -1 line 0 comments Download
PC/python3.mak View 1 2 3 4 1 chunk +0 lines, -14 lines 0 comments Download
PC/python_nt.rc View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
PC/readme.txt View 1 2 3 4 1 chunk +0 lines, -5 lines 0 comments Download
PC/VS9.0/bdist_wininst.vcproj View 1 2 3 4 1 chunk +0 lines, -270 lines 0 comments Download
PC/VS9.0/_bz2.vcproj View 1 2 3 4 1 chunk +0 lines, -581 lines 0 comments Download
PC/VS9.0/_ctypes_test.vcproj View 1 2 3 4 1 chunk +0 lines, -521 lines 0 comments Download
PC/VS9.0/_ctypes.vcproj View 1 2 3 4 1 chunk +0 lines, -705 lines 0 comments Download
PC/VS9.0/debug.vsprops View 1 2 3 4 1 chunk +0 lines, -15 lines 0 comments Download
PC/VS9.0/_decimal.vcproj View 1 2 3 4 1 chunk +0 lines, -743 lines 0 comments Download
PC/VS9.0/_elementtree.vcproj View 1 2 3 4 1 chunk +0 lines, -613 lines 0 comments Download
PC/VS9.0/_hashlib.vcproj View 1 2 3 4 1 chunk +0 lines, -537 lines 0 comments Download
PC/VS9.0/kill_python.c View 1 2 3 4 1 chunk +0 lines, -178 lines 0 comments Download
PC/VS9.0/kill_python.vcproj View 1 2 3 4 1 chunk +0 lines, -279 lines 0 comments Download
PC/VS9.0/_lzma.vcproj View 1 2 3 4 1 chunk +0 lines, -537 lines 0 comments Download
PC/VS9.0/make_buildinfo.c View 1 2 3 4 1 chunk +0 lines, -195 lines 0 comments Download
PC/VS9.0/make_buildinfo.vcproj View 1 2 3 4 1 chunk +0 lines, -101 lines 0 comments Download
PC/VS9.0/make_versioninfo.vcproj View 1 2 3 4 1 chunk +0 lines, -324 lines 0 comments Download
PC/VS9.0/_msi.vcproj View 1 2 3 4 1 chunk +0 lines, -529 lines 0 comments Download
PC/VS9.0/_multiprocessing.vcproj View 1 2 3 4 1 chunk +0 lines, -541 lines 0 comments Download
PC/VS9.0/pcbuild.sln View 1 2 3 4 1 chunk +0 lines, -690 lines 0 comments Download
PC/VS9.0/pginstrument.vsprops View 1 2 3 4 1 chunk +0 lines, -34 lines 0 comments Download
PC/VS9.0/pgupdate.vsprops View 1 2 3 4 1 chunk +0 lines, -14 lines 0 comments Download
PC/VS9.0/pyd_d.vsprops View 1 2 3 4 1 chunk +0 lines, -36 lines 0 comments Download
PC/VS9.0/pyd.vsprops View 1 2 3 4 1 chunk +0 lines, -28 lines 0 comments Download
PC/VS9.0/pyexpat.vcproj View 1 2 3 4 1 chunk +0 lines, -553 lines 0 comments Download
PC/VS9.0/pyproject.vsprops View 1 2 3 4 1 chunk +0 lines, -91 lines 0 comments Download
PC/VS9.0/python3dll.vcproj View 1 2 3 4 1 chunk +0 lines, -246 lines 0 comments Download
PC/VS9.0/pythoncore.vcproj View 1 2 3 4 1 chunk +0 lines, -1877 lines 0 comments Download
PC/VS9.0/python.vcproj View 1 2 3 4 1 chunk +0 lines, -637 lines 0 comments Download
PC/VS9.0/pythonw.vcproj View 1 2 3 4 1 chunk +0 lines, -618 lines 0 comments Download
PC/VS9.0/release.vsprops View 1 2 3 4 1 chunk +0 lines, -15 lines 0 comments Download
PC/VS9.0/select.vcproj View 1 2 3 4 1 chunk +0 lines, -537 lines 0 comments Download
PC/VS9.0/_socket.vcproj View 1 2 3 4 1 chunk +0 lines, -537 lines 0 comments Download
PC/VS9.0/_sqlite3.vcproj View 1 2 3 4 1 chunk +0 lines, -609 lines 0 comments Download
PC/VS9.0/sqlite3.vcproj View 1 2 3 4 1 chunk +0 lines, -537 lines 0 comments Download
PC/VS9.0/sqlite3.vsprops View 1 2 3 4 1 chunk +0 lines, -14 lines 0 comments Download
PC/VS9.0/_ssl.vcproj View 1 2 3 4 1 chunk +0 lines, -537 lines 0 comments Download
PC/VS9.0/ssl.vcproj View 1 2 3 4 1 chunk +0 lines, -189 lines 0 comments Download
PC/VS9.0/_testbuffer.vcproj View 1 2 3 4 1 chunk +0 lines, -521 lines 0 comments Download
PC/VS9.0/_testcapi.vcproj View 1 2 3 4 1 chunk +0 lines, -521 lines 0 comments Download
PC/VS9.0/_testimportmultiple.vcproj View 1 2 3 4 1 chunk +0 lines, -521 lines 0 comments Download
PC/VS9.0/_tkinter.vcproj View 1 2 3 4 1 chunk +0 lines, -541 lines 0 comments Download
PC/VS9.0/unicodedata.vcproj View 1 2 3 4 1 chunk +0 lines, -533 lines 0 comments Download
PC/VS9.0/winsound.vcproj View 1 2 3 4 1 chunk +0 lines, -523 lines 0 comments Download
PC/VS9.0/x64.vsprops View 1 2 3 4 1 chunk +0 lines, -22 lines 0 comments Download
PC/VS9.0/xxlimited.vcproj View 1 2 3 4 1 chunk +0 lines, -417 lines 0 comments Download
Tools/buildbot/build.bat View 1 2 3 4 2 chunks +5 lines, -2 lines 0 comments Download
Tools/buildbot/buildmsi.bat View 1 2 3 4 2 chunks +2 lines, -1 line 0 comments Download
Tools/buildbot/clean.bat View 1 2 3 4 1 chunk +12 lines, -16 lines 0 comments Download
Tools/ssl/sslspeed.vcxproj View 1 2 3 4 1 chunk +70 lines, -0 lines 0 comments Download

Messages

Total messages: 11
Zach Ware
Managed to get a review in while acting as a bassinet. As alluded to in ...
5 years, 3 months ago #1
steve.dower_microsoft.com
Thanks. I only needed one vote to remove the PC/VSxy.0 files, so they're gone now. ...
5 years, 3 months ago #2
AntoinePitrou
http://bugs.python.org/review/22919/diff/13284/Modules/socketmodule.c File Modules/socketmodule.c (right): http://bugs.python.org/review/22919/diff/13284/Modules/socketmodule.c#newcode5853 Modules/socketmodule.c:5853: #if defined(_MSC_VER) && _MSC_VER >= 1800 Is it useful ...
5 years, 3 months ago #3
steve.dower_microsoft.com
http://bugs.python.org/review/22919/diff/13284/Modules/socketmodule.c File Modules/socketmodule.c (right): http://bugs.python.org/review/22919/diff/13284/Modules/socketmodule.c#newcode5853 Modules/socketmodule.c:5853: #if defined(_MSC_VER) && _MSC_VER >= 1800 On 2014/11/23 14:43:31, ...
5 years, 3 months ago #4
AntoinePitrou
http://bugs.python.org/review/22919/diff/13284/PC/python35stub.def File PC/python35stub.def (left): http://bugs.python.org/review/22919/diff/13284/PC/python35stub.def#oldcode1 PC/python35stub.def:1: LIBRARY "python35" If it can be put somewhere then ...
5 years, 3 months ago #5
Zach Ware
A few more comments. Overall, I really like the changes. Especially the flood of red ...
5 years, 3 months ago #6
steve.dower_microsoft.com
http://bugs.python.org/review/22919/diff/13284/.gitignore File .gitignore (right): http://bugs.python.org/review/22919/diff/13284/.gitignore#newcode88 .gitignore:88: Tools/ssl/amd64 On 2014/11/24 16:21:01, Zach Ware wrote: > What ...
5 years, 3 months ago #7
Zach Ware
Just a few comments. I think with these addressed, it should be ready to commit ...
5 years, 2 months ago #8
steve.dower_microsoft.com
I've pushed these fixes to my sandbox and I'll post one more incremental patch from ...
5 years, 2 months ago #9
Zach Ware
Two style nits, one change that's still being stubbornly not-as-expected, and one thing that I'm ...
5 years, 2 months ago #10
steve.dower_microsoft.com
5 years, 2 months ago #11
I'll get this checked in later today (assuming my final tests are all good).

Thanks for all the reviews.

http://bugs.python.org/review/22919/diff/13384/Lib/distutils/msvccompiler.py
File Lib/distutils/msvccompiler.py (right):

http://bugs.python.org/review/22919/diff/13384/Lib/distutils/msvccompiler.py#...
Lib/distutils/msvccompiler.py:161: # v13 was skipped and should be v14
On 2014/12/12 06:31:19, Zach Ware wrote:
> I don't understand this.  Is it meant to be 'if majorVersion == 13:'?

This "system" for figuring out the version is fairly brittle, and I intend to
look into handling it differently in a future patch (i.e. we want to support any
version compiler >= 14 - it doesn't have to match)

Right now the comparison maps _MSC_VER 1900 to 14, 2000 to 15, 2100 to 16, etc.
With an == comparison it's likely that the next VS version would also be mapped
to 14 instead of 15. But as I say, this system is unusual and I'll look at
fixing it properly later.

http://bugs.python.org/review/22919/diff/13384/Lib/distutils/sysconfig.py
File Lib/distutils/sysconfig.py (right):

http://bugs.python.org/review/22919/diff/13384/Lib/distutils/sysconfig.py#new...
Lib/distutils/sysconfig.py:33:
project_base.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64')):
On 2014/12/12 06:31:19, Zach Ware wrote:
> PEP 8 says it's better to do line continuations with () rather than \.

Yeah, I copied from elsewhere in the file, but I'll fix up the two locations
that I touched.

http://bugs.python.org/review/22919/diff/13384/Lib/sysconfig.py
File Lib/sysconfig.py (right):

http://bugs.python.org/review/22919/diff/13384/Lib/sysconfig.py#newcode113
Lib/sysconfig.py:113: _PROJECT_BASE.lower().endswith(('\\pcbuild\\win32',
'\\pcbuild\\amd64')):
On 2014/12/12 06:31:19, Zach Ware wrote:
> Same.

Done.

http://bugs.python.org/review/22919/diff/13384/PCbuild/rt.bat
File PCbuild/rt.bat (right):

http://bugs.python.org/review/22919/diff/13384/PCbuild/rt.bat#newcode43
PCbuild/rt.bat:43: set cmd="%exe%" %dashO% -Wd -E -bb
"%pcbuild%..\lib\test\regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
On 2014/12/12 06:31:19, Zach Ware wrote:
> Almost :)
> 
> (Missing " after regrtest.py)

I'm glad you're being more thorough than me here :)
Sign in to reply to this message.

RSS Feeds Recent Issues | This issue
This is Rietveld 894c83f36cb7+