From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 13 Mar 2019 21:43:47 +0000 (-0700)
Subject: bpo-36174: Update nuget authoring for new license field. (GH-12300)
X-Git-Tag: v2.7.17rc1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce5c7a93d47e07327d19dfb47a967f1b18b7d6e8;p=thirdparty%2FPython%2Fcpython.git

bpo-36174: Update nuget authoring for new license field. (GH-12300)
---

diff --git a/Tools/nuget/make_zip.py b/Tools/nuget/make_zip.py
index 20fadf2dda43..8844cacb096e 100644
--- a/Tools/nuget/make_zip.py
+++ b/Tools/nuget/make_zip.py
@@ -103,6 +103,7 @@ FULL_LAYOUT = [
     ('Lib/', 'Lib', '**/*', include_in_lib),
     ('libs/', 'PCBuild/$arch', '*.lib', include_in_libs),
     ('Tools/', 'Tools', '**/*', include_in_tools),
+    ('/', '', 'LICENSE', None),
 ]
 
 EMBED_LAYOUT = [
diff --git a/Tools/nuget/python2.nuspec b/Tools/nuget/python2.nuspec
index 7c1a63db4e6f..d5e1e8b75717 100644
--- a/Tools/nuget/python2.nuspec
+++ b/Tools/nuget/python2.nuspec
@@ -5,9 +5,8 @@
     <title>Python 2.7</title>
     <version>0.0.0.0</version>
     <authors>Python Software Foundation</authors>
-    <licenseUrl>https://docs.python.org/2.7/license.html</licenseUrl>
+    <license type="file">tools\LICENSE</license>
     <projectUrl>https://www.python.org/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Installs 64-bit Python 2.7 for use in build scenarios.</description>
     <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
     <tags>python</tags>
diff --git a/Tools/nuget/python2x86.nuspec b/Tools/nuget/python2x86.nuspec
index 6f433217054a..ff12ac226c71 100644
--- a/Tools/nuget/python2x86.nuspec
+++ b/Tools/nuget/python2x86.nuspec
@@ -5,9 +5,8 @@
     <title>Python 2.7 (32-bit)</title>
     <authors>Python Software Foundation</authors>
     <version>0.0.0.0</version>
-    <licenseUrl>https://docs.python.org/2.7/license.html</licenseUrl>
+    <license type="file">tools\LICENSE</license>
     <projectUrl>https://www.python.org/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Installs 32-bit Python 2.7 for use in build scenarios.</description>
     <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
     <tags>python</tags>