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

zooba · web-flow · commit ce5c7a93d47e · 2019-03-13T14:43:47.000-07:00
diff --git a/Tools/nuget/make_zip.py b/Tools/nuget/make_zip.py
@@ -103,6 +103,7 @@ def include_in_tools(p):
     ('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
@@ -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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ def include_in_tools(p):`
`103`	`103`	`('Lib/', 'Lib', '*/', include_in_lib),`
`104`	`104`	`('libs/', 'PCBuild/$arch', '*.lib', include_in_libs),`
`105`	`105`	`('Tools/', 'Tools', '*/', include_in_tools),`
	`106`	`+ ('/', '', 'LICENSE', None),`
`106`	`107`	`]`
`107`	`108`
`108`	`109`	`EMBED_LAYOUT = [`