Provide CPython licence to copy during full-build (fixes #2330).

jeff5 · jeff5 · commit e88a7d8dff82 · 2019-08-17T18:12:41.000+01:00
Rather than cloning from the (now legacy) CPython hg repository, we
provide our own copy. Old text in our licence (history section) is
updated to name files correctly.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -188,13 +188,15 @@ From the 2.2 release on, Jython contributors have signed
 Python Software Foundation contributor agreements and releases are
 covered under the Python Software Foundation license version 2.
 
-The standard library is covered by the Python Software Foundation
-license as well. See the Lib/LICENSE file for details.
+The Python standard library developed for CPython is also used in Jython, and
+(like Jython itself) is provided under the Python Software Foundation
+license. See the file LICENSE_CPython.txt for details.
 
 The zxJDBC package was written by Brian Zimmer and originally licensed
 under the GNU Public License.  The package is now covered by the Jython
 Software License.
 
-The command line interpreter is covered by the Apache Software
-License.  See the org/apache/LICENSE file for details.
+Elements of the supporting libraries (appearing renamed in some Jython JARs)
+are covered by the Apache Software License.  See the file LICENSE_Apache.txt
+for details.
 
diff --git a/NEWS b/NEWS
@@ -5,6 +5,7 @@ https://github.com/jythontools/jython
 
 Development tip
   Bugs fixed
+    - [ 2330 ] full-build fails to copy CPython License
     - [ 2651 ] Travis builds failing with *** buffer overflow detected ***
     - [ 2703 ] JycompileAntTask cannot find ...ant.taskdefs.MatchingTask
     - [ 2708 ] test_urllib2net fails (on Travis CI)
diff --git a/build.xml b/build.xml
@@ -801,9 +801,11 @@ The readme text for the next release will be like:
         </jar>
     </target>
 
-    <target name="copy-license" if="do.checkout">
-        <echo>copy CPython LICENSE from ${checkout.dir}/python</echo>
-        <copy file="${checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+    <target name="copy-license" if="full-build">
+        <echo>copy CPython license from ${jython.base.dir}/lib-python</echo>
+        <copy file="${jython.base.dir}/lib-python/LICENSE.txt"
+              tofile="${dist.dir}/LICENSE_CPython.txt"
+              preservelastmodified="true" />
     </target>
 
     <target name="copy-misc-files" depends="init">
diff --git a/lib-python/LICENSE.txt b/lib-python/LICENSE.txt
