mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

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
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ PYTHON_NUSPEC_NAME = "python.nuspec"
NUSPEC_DATA = {
"PYTHON_TAG": VER_DOT,
"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,
}
@ -31,7 +31,7 @@ if not NUSPEC_DATA["PYTHON_VERSION"]:
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" />"""
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>
<projectUrl>https://www.python.org/</projectUrl>
<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>
<tags>python</tags>
<repository type="git" url="https://github.com/Python/CPython.git" commit="{GIT[2]}" />
</metadata>
<files>
<file src="{LOGO}" target="images" />
<file src="python.png" target="images" />
{FILELIST}
</files>
</package>
@ -73,6 +73,6 @@ def get_nuspec_layout(ns):
data[k] = v
if ns.include_all or ns.include_props:
data["FILELIST"] = FILELIST_WITH_PROPS
data["LOGO"] = ns.source / "PC" / "icons" / "logox128.png"
nuspec = NUSPEC_TEMPLATE.format_map(data)
yield "python.nuspec", ("python.nuspec", nuspec.encode("utf-8"))
yield "python.png", ns.source / "PC" / "icons" / "logox128.png"