From 5fcd5e64eec9ed67613b8fe7356fb8288151ceba Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Wed, 6 Sep 2017 10:01:38 -0700 Subject: [PATCH] bpo-31340: Change to building with MSVC v141 (included with Visual Studio 2017) (#3311) --- .github/appveyor.yml | 2 ++ Doc/make.bat | 24 +++++++++++++++++++ Lib/distutils/command/bdist_wininst.py | 22 ++++++++++------- .../2017-09-04-13-19-05.bpo-31340.MbkzLi.rst | 1 + PCbuild/pyproject.props | 18 +++++++++++++- PCbuild/python.props | 2 ++ PCbuild/python.vcxproj | 1 + PCbuild/pythoncore.vcxproj | 3 ++- Tools/msi/exe/exe.wixproj | 24 ++++++++++++++++++- Tools/msi/exe/exe_files.wxs | 2 +- 10 files changed, 86 insertions(+), 13 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2017-09-04-13-19-05.bpo-31340.MbkzLi.rst diff --git a/.github/appveyor.yml b/.github/appveyor.yml index 6a79a621e09..98b32c977d1 100644 --- a/.github/appveyor.yml +++ b/.github/appveyor.yml @@ -14,6 +14,8 @@ test_script: - cmd: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 --fail-env-changed -j0 environment: HOST_PYTHON: C:\Python36\python.exe +image: +- Visual Studio 2017 # Only trigger AppVeyor if actual code or its configuration changes only_commits: diff --git a/Doc/make.bat b/Doc/make.bat index b03372aade7..c43135d75be 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -16,8 +16,19 @@ if not defined SPHINXBUILD if defined PYTHON ( set SPHINXBUILD=%PYTHON% -c "import sphinx, sys; sys.argv[0] = 'sphinx-build'; sphinx.main()" ) +if not defined BLURB if defined PYTHON ( + %PYTHON% -c "import blurb" > nul 2> nul + if errorlevel 1 ( + echo Installing blurb with %PYTHON% + %PYTHON% -m pip install blurb + if errorlevel 1 exit /B + ) + set BLURB=%PYTHON% -m blurb +) + if not defined PYTHON set PYTHON=py if not defined SPHINXBUILD set SPHINXBUILD=sphinx-build +if not defined BLURB set BLURB=blurb if "%1" NEQ "htmlhelp" goto :skiphhcsearch if exist "%HTMLHELP%" goto :skiphhcsearch @@ -96,6 +107,19 @@ echo.be passed by setting the SPHINXOPTS environment variable. goto end :build +if exist ..\Misc\NEWS ( + echo.Copying Misc\NEWS to build\NEWS + copy ..\Misc\NEWS build\NEWS > nul +) else if exist ..\Misc\NEWS.D ( + if defined BLURB ( + echo.Merging Misc/NEWS with %BLURB% + %BLURB% merge -f build\NEWS + ) else ( + echo.No Misc/NEWS file and Blurb is not available. + exit /B 1 + ) +) + if NOT "%PAPER%" == "" ( set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS% ) diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py index d3e1d3af22c..6309c3e248c 100644 --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -318,26 +318,30 @@ class bdist_wininst(Command): # string compares seem wrong, but are what sysconfig.py itself uses if self.target_version and self.target_version < cur_version: if self.target_version < "2.4": - bv = 6.0 + bv = '6.0' elif self.target_version == "2.4": - bv = 7.1 + bv = '7.1' elif self.target_version == "2.5": - bv = 8.0 + bv = '8.0' elif self.target_version <= "3.2": - bv = 9.0 + bv = '9.0' elif self.target_version <= "3.4": - bv = 10.0 + bv = '10.0' else: - bv = 14.0 + bv = '14.0' else: # for current version - use authoritative check. try: from msvcrt import CRT_ASSEMBLY_VERSION except ImportError: # cross-building, so assume the latest version - bv = 14.0 + bv = '14.0' else: - bv = float('.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2])) + bv = '.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2]) + if bv == '14.11': + # v141 and v140 are binary compatible, + # so keep using the 14.0 stub. + bv = '14.0' # wininst-x.y.exe is in the same directory as this file @@ -353,7 +357,7 @@ class bdist_wininst(Command): else: sfix = '' - filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix)) + filename = os.path.join(directory, "wininst-%s%s.exe" % (bv, sfix)) f = open(filename, "rb") try: return f.read() diff --git a/Misc/NEWS.d/next/Windows/2017-09-04-13-19-05.bpo-31340.MbkzLi.rst b/Misc/NEWS.d/next/Windows/2017-09-04-13-19-05.bpo-31340.MbkzLi.rst new file mode 100644 index 00000000000..065596fcc85 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2017-09-04-13-19-05.bpo-31340.MbkzLi.rst @@ -0,0 +1 @@ +Change to building with MSVC v141 (included with Visual Studio 2017) diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 6ab9b6533f2..aed8f34583b 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -147,8 +147,24 @@ foreach (System.Diagnostics.Process p in System.Diagnostics.Process.GetProcesses Targets="CleanAll" /> + + + <_PGCFiles Include="$(OutDir)instrumented\$(TargetName)!*.pgc" /> + <_PGDFile Include="$(OutDir)instrumented\$(TargetName).pgd" /> + <_CopyFiles Include="@(_PGCFiles);@(_PGDFile)" Condition="Exists(%(FullPath))" /> + + + + + + - $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot10)\bin\x86 + $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot10)\bin\$(DefaultWindowsSDKVersion)\x86 + $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot10)\bin\x86 $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot81)\bin\x86 $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot)\bin\x86 $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A@InstallationFolder)\Bin\ diff --git a/PCbuild/python.props b/PCbuild/python.props index c81cd94fe40..c2baebc06c7 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -10,6 +10,7 @@ We set BasePlatformToolset for ICC's benefit, it's otherwise ignored. --> + v141 v140 v120 v110 @@ -39,6 +40,7 @@ $(BuildPath64) $(PySourcePath)PCBuild\$(ArchName)\ $(BuildPath)\ + $(BuildPath)instrumented\ $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`)) diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index 2786ac2ebf7..ab9fb05adea 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -96,6 +96,7 @@ set PYTHONPATH=$(PySourcePath)Lib <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(Platform) == 'Win32'">@set PATH=%PATH%%3B$(VCInstallDir)bin <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(Platform) == 'x64'">@set PATH=%PATH%%3B$(VCInstallDir)bin\amd64 + <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(VC_PGO_RunTime_Dir) != ''">@set PATH=%PATH%%3B$(VC_PGO_RunTime_Dir) <_Content>@rem This script invokes the most recently built Python with all arguments @rem passed through to the interpreter. This file is generated by the @rem build process and any changes *will* be thrown away by the next diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 8ebb22e0e2b..763540e1736 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -49,6 +49,7 @@ true + true @@ -429,7 +430,7 @@ - + diff --git a/Tools/msi/exe/exe.wixproj b/Tools/msi/exe/exe.wixproj index 50f6f882460..8eaf494c4d4 100644 --- a/Tools/msi/exe/exe.wixproj +++ b/Tools/msi/exe/exe.wixproj @@ -39,6 +39,28 @@ Overwrite="true" Lines="@(_LicenseFiles->'%(Content)')" /> - + + + + + + + + + + + + + + + + + @(HostPython) + $(HostPython.Remove($(HostPython.IndexOf(';')))) + + + + + \ No newline at end of file diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs index e675c21c897..394b4de4735 100644 --- a/Tools/msi/exe/exe_files.wxs +++ b/Tools/msi/exe/exe_files.wxs @@ -6,7 +6,7 @@ - +