mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 09:54:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

bpo-39789: Update Windows release build machines to VS 2019 (GH-18695)

Browse Source 
Also fixes some potential Nuget build issues.
This commit is contained in:
Steve Dower 2020-02-29 00:21:46 +00:00 committed by GitHub
parent c2f7eb254b
commit 03153dd145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.azure-pipelines/windows-release/stage-build.yml
View File

@ -3,7 +3,7 @@ jobs:
displayName: Docs build displayName: Docs build
pool: pool:
name: 'Windows Release' name: 'Windows Release'
#vmName: win2016-vs2017 #vmImage: windows-2019
workspace: workspace:
clean: all clean: all
@ -45,7 +45,7 @@ jobs:
displayName: Python build displayName: Python build
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all
@ -91,7 +91,7 @@ jobs:
condition: and(succeeded(), ne(variables['DoPGO'], 'true')) condition: and(succeeded(), ne(variables['DoPGO'], 'true'))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all
@ -141,7 +141,7 @@ jobs:
displayName: Publish Tcl/Tk Library displayName: Publish Tcl/Tk Library
pool: pool:
vmName: windows-latest vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-layout-embed.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoEmbed'], 'true')) condition: and(succeeded(), eq(variables['DoEmbed'], 'true'))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-layout-full.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoLayout'], 'true')) condition: and(succeeded(), eq(variables['DoLayout'], 'true'))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-layout-msix.yml
View File

@ -3,7 +3,7 @@ jobs:
displayName: Make MSIX layout displayName: Make MSIX layout
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-layout-nuget.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoNuget'], 'true')) condition: and(succeeded(), eq(variables['DoNuget'], 'true'))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-msi.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), not(variables['SigningCertificate'])) condition: and(succeeded(), not(variables['SigningCertificate']))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
variables: variables:
ReleaseUri: http://www.python.org/{arch} ReleaseUri: http://www.python.org/{arch}

2
.azure-pipelines/windows-release/stage-pack-msix.yml
View File

@ -3,7 +3,7 @@ jobs:
displayName: Pack MSIX bundles displayName: Pack MSIX bundles
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-pack-nuget.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoNuget'], 'true')) condition: and(succeeded(), eq(variables['DoNuget'], 'true'))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-publish-nugetorg.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoNuget'], 'true')) condition: and(succeeded(), eq(variables['DoNuget'], 'true'))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-publish-pythonorg.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), and(eq(variables['DoMSI'], 'true'), eq(variables['DoEmbed'], 'true'))) condition: and(succeeded(), and(eq(variables['DoMSI'], 'true'), eq(variables['DoEmbed'], 'true')))
pool: pool:
#vmName: win2016-vs2017 #vmImage: windows-2019
name: 'Windows Release' name: 'Windows Release'
workspace: workspace:

2
.azure-pipelines/windows-release/stage-publish-store.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoMSIX'], 'true')) condition: and(succeeded(), eq(variables['DoMSIX'], 'true'))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-sign.yml
View File

@ -114,7 +114,7 @@ jobs:
condition: and(succeeded(), not(variables['SigningCertificate'])) condition: and(succeeded(), not(variables['SigningCertificate']))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
steps: steps:
- checkout: none - checkout: none

2
.azure-pipelines/windows-release/stage-test-embed.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoEmbed'], 'true')) condition: and(succeeded(), eq(variables['DoEmbed'], 'true'))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-test-msi.yml
View File

@ -3,7 +3,7 @@ jobs:
displayName: Test MSI displayName: Test MSI
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

2
.azure-pipelines/windows-release/stage-test-nuget.yml
View File

@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoNuget'], 'true')) condition: and(succeeded(), eq(variables['DoNuget'], 'true'))
pool: pool:
vmName: win2016-vs2017 vmImage: windows-2019
workspace: workspace:
clean: all clean: all

1
Misc/NEWS.d/next/Windows/2020-02-28-22-46-09.bpo-39789.67XRoP.rst Normal file
View File

@ -0,0 +1 @@
Update Windows release build machines to Visual Studio 2019 (MSVC 14.2).

10
PC/layout/support/nuspec.py
View File

@ -14,7 +14,7 @@ PYTHON_NUSPEC_NAME = "python.nuspec"
NUSPEC_DATA = { NUSPEC_DATA = {
"PYTHON_TAG": VER_DOT, "PYTHON_TAG": VER_DOT,
"PYTHON_VERSION": os.getenv("PYTHON_NUSPEC_VERSION"), "PYTHON_VERSION": os.getenv("PYTHON_NUSPEC_VERSION"),
"FILELIST": r' <file src="**\*" target="tools" />', "FILELIST": r' <file src="**\*" exclude="python.png" target="tools" />',
"GIT": sys._git, "GIT": sys._git,
} }
@ -31,7 +31,7 @@ if not NUSPEC_DATA["PYTHON_VERSION"]:
VER_DOT, VER_MICRO, "-" if VER_SUFFIX else "", VER_SUFFIX VER_DOT, VER_MICRO, "-" if VER_SUFFIX else "", VER_SUFFIX
) )
FILELIST_WITH_PROPS = r""" <file src="**\*" exclude="python.props" target="tools" /> FILELIST_WITH_PROPS = r""" <file src="**\*" exclude="python.png;python.props" target="tools" />
<file src="python.props" target="build\native" />""" <file src="python.props" target="build\native" />"""
NUSPEC_TEMPLATE = r"""<?xml version="1.0"?> NUSPEC_TEMPLATE = r"""<?xml version="1.0"?>
@ -44,13 +44,13 @@ NUSPEC_TEMPLATE = r"""<?xml version="1.0"?>
<license type="file">tools\LICENSE.txt</license> <license type="file">tools\LICENSE.txt</license>
<projectUrl>https://www.python.org/</projectUrl> <projectUrl>https://www.python.org/</projectUrl>
<description>Installs {PYTHON_BITNESS} Python for use in build scenarios.</description> <description>Installs {PYTHON_BITNESS} Python for use in build scenarios.</description>
<icon>images\logox128.png</icon> <icon>images\python.png</icon>
<iconUrl>https://www.python.org/static/favicon.ico</iconUrl> <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
<tags>python</tags> <tags>python</tags>
<repository type="git" url="https://github.com/Python/CPython.git" commit="{GIT[2]}" /> <repository type="git" url="https://github.com/Python/CPython.git" commit="{GIT[2]}" />
</metadata> </metadata>
<files> <files>
<file src="{LOGO}" target="images" /> <file src="python.png" target="images" />
{FILELIST} {FILELIST}
</files> </files>
</package> </package>
@ -73,6 +73,6 @@ def get_nuspec_layout(ns):
data[k] = v data[k] = v
if ns.include_all or ns.include_props: if ns.include_all or ns.include_props:
data["FILELIST"] = FILELIST_WITH_PROPS data["FILELIST"] = FILELIST_WITH_PROPS
data["LOGO"] = ns.source / "PC" / "icons" / "logox128.png"
nuspec = NUSPEC_TEMPLATE.format_map(data) nuspec = NUSPEC_TEMPLATE.format_map(data)
yield "python.nuspec", ("python.nuspec", nuspec.encode("utf-8")) yield "python.nuspec", ("python.nuspec", nuspec.encode("utf-8"))
yield "python.png", ns.source / "PC" / "icons" / "logox128.png"

2
Tools/nuget/make_pkg.proj
View File

@ -33,7 +33,7 @@
<PackageArguments Condition="$(Packages) != ''">"$(IntermediateOutputPath)pkg\pip.exe" -B -m pip install -U $(Packages)</PackageArguments> <PackageArguments Condition="$(Packages) != ''">"$(IntermediateOutputPath)pkg\pip.exe" -B -m pip install -U $(Packages)</PackageArguments>
<NugetPackCommand>"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec" -BasePath "$(IntermediateOutputPath)pkg"</NugetPackCommand> <NugetPackCommand>"$(Nuget)" pack "$(IntermediateOutputPath)pkg\python.nuspec" -BasePath "$(IntermediateOutputPath)pkg"</NugetPackCommand>
<NugetPackSymbolsCommand Condition="Exists('$(MSBuildThisFileDirectory)\$(OutputName).symbols.nuspec')">"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).symbols.nuspec" -BasePath "$(BuildPath.TrimEnd(`\`))"</NugetPackSymbolsCommand> <NugetPackSymbolsCommand Condition="Exists('$(MSBuildThisFileDirectory)\$(OutputName).symbols.nuspec')">"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).symbols.nuspec" -BasePath "$(BuildPath.TrimEnd(`\`))"</NugetPackSymbolsCommand>
<NugetArguments>$(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))"</NugetArguments> <NugetArguments>$(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))"</NugetArguments>
<NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments> <NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments>