Read about our upcoming Code of Conduct on this issue

Commit 95a118e6 authored by Matti Picus's avatar Matti Picus
Browse files

use actual license terms instead of whatever is in /usr/share/doc/*/copyright for tcl,tk

--HG--
branch : packaging
parent dcd167230ac0
This software is copyrighted by the Regents of the University of
California, Sun Microsystems, Inc., and other parties. The following
terms apply to all files associated with the software unless explicitly
disclaimed in individual files.
The authors hereby grant permission to use, copy, modify, distribute,
and license this software and its documentation for any purpose, provided
that existing copyright notices are retained in all copies and that this
notice is included verbatim in any distributions. No written agreement,
license, or royalty fee is required for any of the authorized uses.
Modifications to this software may be copyrighted by their authors
and need not follow the licensing terms described here, provided that
the new terms are clearly indicated on the first page of each file where
they apply.
IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
MODIFICATIONS.
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
Government shall have only "Restricted Rights" as defined in Clause
252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
authors grant the U.S. Government and others acting in its behalf
permission to use and distribute the software in accordance with the
terms specified in this license.
......@@ -50,6 +50,8 @@ def fix_permissions(dirname):
os.system("chmod -R a+rX %s" % dirname)
os.system("chmod -R g-w %s" % dirname)
sep_template = "\nThis copy of PyPy includes a copy of %s, which is licensed under the following terms:\n\n"
def generate_license_linux(base_file, options):
with open(base_file) as fid:
txt = fid.read()
......@@ -57,12 +59,16 @@ def generate_license_linux(base_file, options):
("openssl", "openssl*", "copyright", 'LICENSE ISSUES'),
]
if not options.no_tk:
searches += [("tk", "tk-dev", "copyright", "Copyright"),
("tcl", "tcl-dev", "copyright", "Copyright")]
name = 'Tcl/Tk'
txt += "License for '%s'" %name
txt += '\n' + "="*(14 + len(name)) + '\n'
txt += sep_template % name
with open('lib_pypy/_tkinter/license.terms', 'r') as fid:
txt += fid.read()
for name, pat, fname, first_line in searches:
txt += "License for '" + name + "'"
txt += '\n' + "="*(14 + len(name)) + '\n'
txt += "\nThis copy of PyPy includes a copy of %s, which is licensed under the following terms:\n\n" % name
txt += sep_template % name
dirs = glob.glob(options.license_base + "/" +pat)
if not dirs:
raise ValueError, "Could not find "+ options.license_base + "/" + pat
......@@ -88,12 +94,16 @@ def generate_license_windows(base_file, options):
with open(base_file) as fid:
txt = fid.read()
# shutil.copyfileobj(open("crtlicense.txt"), out) # We do not ship msvc runtime files
if not options.no_tk:
name = 'Tcl/Tk'
txt += "License for '%s'" %name
txt += '\n' + "="*(14 + len(name)) + '\n'
txt += sep_template % name
with open('lib_pypy/_tkinter/license.terms', 'r') as fid:
txt += fid.read()
for name, pat, file in (("bzip2","bzip2-*", "LICENSE"),
("openssl", "openssl-*", "LICENSE"),
("Tcl", "tcl-8*", "license.terms"),
("Tk", "tk-8*", "license.terms"),
("Tix", "tix-*", "license.terms")):
txt += "\nThis copy of PyPy includes a copy of %s, which is licensed under the following terms:\n\n" % name
("openssl", "openssl-*", "LICENSE")):
txt += sep_template % name
dirs = glob.glob(options.license_base + "/" +pat)
if not dirs:
raise ValueError, "Could not find "+ options.license_base + "/" + pat
......
......@@ -122,5 +122,5 @@ def test_generate_license():
license = package.generate_license(join(basedir,'LICENSE'), options)
assert 'bzip2' in license
assert 'openssl' in license
assert 'tcl' in license
assert 'Tcl' in license
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment