GitLab will be upgraded to the 12.10.14-ce.0 on 28 Sept 2020 at 2.00pm (AEDT) to 2.30pm (AEDT). During the update, GitLab and Mattermost services will not be available. If you have any concerns with this, please talk to us at N110 (b) CSIT building.

Commit e680f97d authored by mattip's avatar mattip

merge packaging branch into default, which updates command line parsing

and extends LICENSE file to reflect third-party contributions
parents 0b374a2b 63bda61b
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.
......@@ -12,3 +12,9 @@ Annotator cleanups
.. branch: release-2.3.x
.. branch: unify-call-ops
.. branch packaging
Use argparse for packaging.py, and add third-party components to LICENSE file.
Also mention that gdbm is GPL.
Do not crash the packaging process on failure in CFFI or license-building,
rather complete the build step and return -1.
This diff is collapsed.
import py
from pypy.conftest import pypydir
from pypy.tool.release import package
from pypy.tool.release import package, package
from pypy.module.sys.version import CPYTHON_VERSION
import tarfile, zipfile, sys
......@@ -25,8 +25,9 @@ def test_dir_structure(test='test'):
else:
fake_pypy_c = False
try:
builddir = package.package(py.path.local(pypydir).dirpath(), test,
retval, builddir = package.package(py.path.local(pypydir).dirpath(), test,
rename_pypy_c)
assert retval == 0
prefix = builddir.join(test)
cpyver = '%d.%d' % CPYTHON_VERSION[:2]
assert prefix.join('lib-python', cpyver, 'test').check()
......@@ -74,7 +75,6 @@ def test_dir_structure(test='test'):
pypy_c.remove()
def test_with_zipfile_module():
from pypy.tool.release import package
prev = package.USE_ZIPFILE_MODULE
try:
package.USE_ZIPFILE_MODULE = True
......@@ -106,3 +106,22 @@ def test_fix_permissions(tmpdir):
check(file1, 0644)
check(file2, 0644)
check(pypy, 0755)
def test_generate_license():
from os.path import dirname, abspath, join
class Options(object):
pass
options = Options()
basedir = dirname(dirname(dirname(dirname(dirname(abspath(__file__))))))
options.no_tk = False
if sys.platform == 'win32':
# Following recommended build setup at
# http://doc.pypy.org/en/latest/windows.html#abridged-method-for-ojit-builds-using-visual-studio-2008
options.license_base = dirname(basedir) + '/local'
else:
options.license_base = '/usr/share/doc'
license = package.generate_license(join(basedir,'LICENSE'), options)
assert 'bzip2' in license
assert 'openssl' 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