[pypy-commit] pypy default: Remove the crazy copying of license files from the current system.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r73747:97f975585866
Date: 2014-09-30 18:51 +0200
http://bitbucket.org/pypy/pypy/changeset/97f975585866/

Log:	Remove the crazy copying of license files from the current system.
	Instead, write some static blurb of text that I hope is better
	anyway.

diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -367,3 +367,43 @@
 Detailed license information is contained in the NOTICE file in the
 directory.
 
+
+Licenses and Acknowledgements for Incorporated Software
+=======================================================
+
+This section is an incomplete, but growing list of licenses and
+acknowledgements for third-party software incorporated in the PyPy
+distribution.
+
+License for 'Tcl/Tk'
+--------------------
+
+This copy of PyPy contains library code that may, when used, result in
+the Tcl/Tk library to be loaded.  PyPy also includes code that may be
+regarded as being a copy of some parts of the Tcl/Tk header files.
+You may see a copy of the License for Tcl/Tk in the file
+`lib_pypy/_tkinter/license.terms` included here.
+
+License for 'bzip2'
+-------------------
+
+This copy of PyPy may be linked (dynamically or statically) with the
+bzip2 library.  You may see a copy of the License for bzip2/libbzip2 at
+
+    http://www.bzip.org/1.0.5/bzip2-manual-1.0.5.html
+
+License for 'openssl'
+---------------------
+
+This copy of PyPy may be linked (dynamically or statically) with the
+openssl library.  You may see a copy of the License for OpenSSL at
+
+    https://www.openssl.org/source/license.html
+
+License for 'gdbm'
+------------------
+
+The gdbm module includes code from gdbm.h, which is distributed under
+the terms of the GPL license version 2 or any later version.  Thus the
+gdbm module, provided in the file lib_pypy/gdbm.py, is redistributed
+under the terms of the GPL license as well.
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -49,6 +49,16 @@
         os.system("chmod -R a+rX %s" % dirname)
         os.system("chmod -R g-w %s" % dirname)
 
+
+#
+# Some crazy nonsense (imho) about including automatically the license
+# of various libraries as they happen to be on this system.  This is
+# strange because most of these libraries are linked to dynamically,
+# and so at runtime might end up with a different version.  I (arigo)
+# killed this logic and wrote some general info (which I hope is more
+# sensible anyway) into our ../../../LICENSE file.
+#
+'''
 sep_template = "\nThis copy of PyPy includes a copy of %s, which is licensed under the following terms:\n\n"
 
 def generate_license(basedir, options):
@@ -95,6 +105,7 @@
     # Do something for gdbm, which is GPL
     txt += gdbm_bit
     return txt
+'''
 
 def create_cffi_import_libraries(pypy_c, options):
     modules = ['_sqlite3']
@@ -216,19 +227,19 @@
     for file in ['_testcapimodule.c', '_ctypes_test.c']:
         shutil.copyfile(str(basedir.join('lib_pypy', file)),
                         str(pypydir.join('lib_pypy', file)))
-    try:
+    if 0:  # disabled
         license = generate_license(basedir, options)
         with open(str(pypydir.join('LICENSE')), 'w') as LICENSE:
             LICENSE.write(license)
-    except:
-        # Non-fatal error, use original LICENCE file
-        import traceback;traceback.print_exc()
+    else:
+        # Use original LICENCE file
+        #import traceback;traceback.print_exc()
         base_file = str(basedir.join('LICENSE'))
         with open(base_file) as fid:
             license = fid.read()
         with open(str(pypydir.join('LICENSE')), 'w') as LICENSE:
             LICENSE.write(license)
-        retval = -1
+        #retval = -1
     #
     spdir = pypydir.ensure('site-packages', dir=True)
     shutil.copy(str(basedir.join('site-packages', 'README')), str(spdir))
@@ -321,7 +332,8 @@
     parser.add_argument('--archive-name', dest='name', type=str, default='',
         help='pypy-VER-PLATFORM')
     parser.add_argument('--license_base', type=str, default=license_base,
-        help='where to start looking for third party upstream licensing info')
+        #help='where to start looking for third party upstream licensing info')
+        help='(ignored)')
     parser.add_argument('--builddir', type=str, default='',
         help='tmp dir for packaging')
     parser.add_argument('--targetdir', type=str, default='',
@@ -356,24 +368,6 @@
     return create_package(basedir, options)
 
 
-third_party_header = '''\n\nLicenses and Acknowledgements for Incorporated Software
-=======================================================
-
-This section is an incomplete, but growing list of licenses and acknowledgements
-for third-party software incorporated in the PyPy distribution.
-
-'''
-
-gdbm_bit = '''gdbm
-----
-
-The gdbm module includes code from gdbm.h, which is distributed under the terms
-of the GPL license version 2 or any later version.  Thus the gdbm module, provided in
-the file lib_pypy/gdbm.py, is redistributed under the terms of the GPL license as
-well.
-'''
-
-
 if __name__ == '__main__':
     import sys
     if sys.platform == 'win32':