diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-02-29 00:41:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 00:41:03 (GMT) |
| commit | 45c4112b7250cb600aa2f3a42b4e6b5bfd2919c4 (patch) | |
| tree | 8eccc86555e72fefbcf08f4808ad13d46402b8a0 /PC | |
| parent | 7f53d87cb0324e391c969855ed8f4b3255f9f744 (diff) | |
| download | cpython-45c4112b7250cb600aa2f3a42b4e6b5bfd2919c4.zip cpython-45c4112b7250cb600aa2f3a42b4e6b5bfd2919c4.tar.gz cpython-45c4112b7250cb600aa2f3a42b4e6b5bfd2919c4.tar.bz2 | |
bpo-39789: Update Windows release build machines to VS 2019 (GH-18695)
Also fixes some potential Nuget build issues.
(cherry picked from commit 03153dd1459fab94f294a118ed1525e34d58601a)
Co-authored-by: Steve Dower <steve.dower@python.org>
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/layout/support/nuspec.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/PC/layout/support/nuspec.py b/PC/layout/support/nuspec.py index 9c6a9a9..dbcb713 100644 --- a/PC/layout/support/nuspec.py +++ b/PC/layout/support/nuspec.py @@ -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" |