Skip to content

Commit

Permalink
copyright: Add code for finding all copyright blocks and create a COP…
Browse files Browse the repository at this point in the history
…YING file

The end of the COPYING file was generated with:
% python ./util/find_copyrights.py configs src system tests util

Update -C command line option to spit out COPYING file
  • Loading branch information
binkert committed Jun 3, 2011
1 parent f656787 commit 0c42434
Show file tree
Hide file tree
Showing 6 changed files with 326 additions and 127 deletions.
109 changes: 0 additions & 109 deletions AUTHORS

This file was deleted.

47 changes: 47 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
Please see individual files for details of the license on each file.
The preferred license can be found in LICENSE.

All files in this distribution (other than in the ext directory) have
licenses based on the BSD or MIT licenses. Some files in the ext
directory are GNU LGPL. No other licenses are found in this
distribution.

Beyond the BSD license, some files include the following clarification
of the license as required by the copyright holder:

The license below extends only to copyright in the software and
shall not be construed as granting a license to any other
intellectual property including but not limited to intellectual
property relating to a hardware implementation of the
functionality of the software licensed hereunder. You may use the
software subject to the license terms below provided that you
ensure that this notice is replicated unmodified and in its
entirety in all distributions of the software, modified or
unmodified, in source code or in binary form.

The copyright holders include (not counting the ext directory):

Copyright (c) 2000-2011 The Regents of The University of Michigan
Copyright (c) 1990,1993-1995,2007-2010 The Hewlett-Packard Development Company
Copyright (c) 1999-2009,2011 Mark D. Hill and David A. Wood
Copyright (c) 2009-2011 ARM Limited
Copyright (c) 2008-2009 Princeton University
Copyright (c) 2007 MIPS Technologies, Inc.
Copyright (c) 2009-2011 Advanced Micro Devices, Inc.
Copyright (c) 2009 The University of Edinburgh
Copyright (c) 2007-2008 The Florida State University
Copyright (c) 2010 Massachusetts Institute of Technology
Copyright (c) 1990-1993 The Regents of the University of California
Copyright (c) 2006-2009 Nathan Binkert
Copyright (c) 2001 The NetBSD Foundation, Inc.
Copyright (c) 2010-2011 Gabe Black
Copyright (c) 1994 Adam Glass
Copyright (c) 1990-1992 MIPS Computer Systems, Inc.
Copyright (c) 2004 Richard J. Wagner
Copyright (c) 2000 Computer Engineering and Communication Networks Lab
Copyright (c) 2001 Eric Jackson
Copyright (c) 1990 Hewlett-Packard Development Company
Copyright (c) 1994-1996 Carnegie-Mellon University.
Copyright (c) 1993-1994 Christopher G. Demetriou
Copyright (c) 1997-2002 Makoto Matsumoto and Takuji Nishimura
Copyright (c) 1998,2001 Manuel Bouyer.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2000-2011 The Regents of The University of Michigan
Copyright (c) <date> <copyright holder>
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion src/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ def makeInfoPyFile(target, source, env):

# Generate a file that wraps the basic top level files
env.Command('python/m5/info.py',
[ '#/AUTHORS', '#/LICENSE', '#/README', ],
[ '#/COPYING', '#/LICENSE', '#/README', ],
MakeAction(makeInfoPyFile, Transform("INFO")))
PySource('m5', 'python/m5/info.py')

Expand Down
20 changes: 4 additions & 16 deletions src/python/m5/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,8 @@

usage="%prog [gem5 options] script.py [script options]"
version="%prog 2.0"
brief_copyright='''
Copyright (c) 2001-2011
The Regents of The University of Michigan
All Rights Reserved
'''
brief_copyright=\
"gem5 is copyrighted software; use the --copyright option for details."

def parse_options():
import config
Expand All @@ -52,8 +49,6 @@ def parse_options():
group = options.set_group

# Help options
option('-A', "--authors", action="store_true", default=False,
help="Show author information")
option('-B', "--build-info", action="store_true", default=False,
help="Show build information")
option('-C', "--copyright", action="store_true", default=False,
Expand Down Expand Up @@ -211,14 +206,7 @@ def check_tracing():

if options.copyright:
done = True
print info.LICENSE
print

if options.authors:
done = True
print 'Author information:'
print
print info.AUTHORS
print info.COPYING
print

if options.readme:
Expand Down Expand Up @@ -263,7 +251,7 @@ def check_tracing():

verbose = options.verbose - options.quiet
if options.verbose >= 0:
print "gem5 Simulator System"
print "gem5 Simulator System. http://gem5.org"
print brief_copyright
print

Expand Down
Loading

0 comments on commit 0c42434

Please sign in to comment.