Skip to content

Commit

Permalink
General overhaul of license and copyright information
Browse files Browse the repository at this point in the history
The GPL license text is now located in GPLv3.txt. LICENSE.txt contains licenses
and copyright information for all bundled files from other sources and
AUTHORS.txt lists all contributors (taken from "git log").

At the same time, manual.txt was renamed to MANUAL.txt for consistency reasons.
  • Loading branch information
jrosdahl committed Aug 2, 2010
1 parent feb1e2d commit 4aaa6a1
Show file tree
Hide file tree
Showing 9 changed files with 527 additions and 71 deletions.
30 changes: 30 additions & 0 deletions AUTHORS.txt
@@ -0,0 +1,30 @@
ccache authors
==============

ccache was originally written by Andrew Tridgell and is currently developed and
maintained by Joel Rosdahl.

ccache is a collective work with contributions from many people, including:

* Andrea Bittau <a.bittau@cs.ucl.ac.uk>
* Andrew Tridgell <tridge@samba.org>
* Bernhard Bauer <bauerb@google.com>
* Clemens Rabe <crabe@gmx.de>
* Francois Marier <francois@debian.org>
* Joel Rosdahl <joel@rosdahl.net>
* John Coiner <john.coiner@amd.com>
* Karl Chen <quarl@cs.berkeley.edu>
* Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>
* Lars Gustäbel <lars@gustaebel.de>
* Martin Pool <mbp@sourcefrog.net>
* Owen Mann <owen@mann.org>
* Paul Griffith <paulg@cse.yorku.ca>
* Ramiro Polla <ramiro.polla@gmail.com>
* Robin H. Johnson <robbat2@gentoo.org>
* RW <fbsd06@mlists.homeunix.com>
* Tim Potter <tpot@samba.org>
* Ville Skytta <ville.skytta@iki.fi>
* William S Fulton <wsf@fultondesigns.co.uk>
* Wilson Snyder <wsnyder@wsnyder.org>

Thanks!
1 change: 0 additions & 1 deletion COPYING → GPL-3.0.txt
@@ -1,4 +1,3 @@

GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Expand Down
469 changes: 469 additions & 0 deletions LICENSE.txt

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions manual.txt → MANUAL.txt
Expand Up @@ -73,11 +73,13 @@ path.

To install for the second method, do something like this:

cp ccache /usr/local/bin/
ln -s ccache /usr/local/bin/gcc
ln -s ccache /usr/local/bin/g++
ln -s ccache /usr/local/bin/cc
ln -s ccache /usr/local/bin/c++
-------------------------------------------------------------------------------
cp ccache /usr/local/bin/
ln -s ccache /usr/local/bin/gcc
ln -s ccache /usr/local/bin/g++
ln -s ccache /usr/local/bin/cc
ln -s ccache /usr/local/bin/c++
-------------------------------------------------------------------------------

And so forth. This will work as long as +/usr/local/bin+ comes before the path
to the compiler (which is usually in +/usr/bin+). After installing you may wish
Expand Down Expand Up @@ -720,6 +722,6 @@ etc, can be found on ccache's web site: <http://ccache.samba.org>.
Author
------

ccache is currently maintained by Joel Rosdahl and was originally written by
Andrew Tridgell. See <http://ccache.samba.org/credits.html> for a list of
contributors.
ccache was originally written by Andrew Tridgell and is currently developed and
maintained by Joel Rosdahl. See AUTHORS.txt or AUTHORS.html and
<http://ccache.samba.org/credits.html> for a list of contributors.
25 changes: 9 additions & 16 deletions README.txt
Expand Up @@ -16,13 +16,13 @@ more information.
Documentation
-------------

See the ccache(1) man page. It's also avaiable as manual.txt and manual.html.
See the ccache(1) man page. It's also available as MANUAL.{txt,html}.


Installation
------------

See INSTALL.txt or INSTALL.html.
See INSTALL.{txt.html}.


Web site
Expand Down Expand Up @@ -68,21 +68,14 @@ You can also browse the repository:
History
-------

ccache was originally written by Andrew Tridgell and is currently maintained by
Joel Rosdahl. ccache started out as a reimplementation of Erik Thiele's
``compilercache'' (see http://www.erikyyy.de/compilercache/) in C.
ccache was originally written by Andrew Tridgell and is currently developed and
maintained by Joel Rosdahl. ccache started out as a reimplementation of Erik
Thiele's ``compilercache'' (see http://www.erikyyy.de/compilercache/) in C.

See also NEWS.txt or NEWS.html.
See also NEWS.{txt,html}.


Copyright
---------
License and copyright
---------------------

Copyright (C) 2002-2007 Andrew Tridgell
Copyright (C) 2009-2010 Joel Rosdahl

ccache may be used, modified and redistributed only under the terms of the GNU
General Public License version 3 or later, found in the file COPYING in this
distribution, or on this web page:

http://www.fsf.org/licenses/gpl.html
See LICENSE.{txt,html} and AUTHORS.{txt,html}.
10 changes: 6 additions & 4 deletions dev.mk.in
Expand Up @@ -15,7 +15,9 @@ dist_dir = ccache-$(version)
dist_archive_tar_bz2 = ccache-$(version).tar.bz2
dist_archive_tar_gz = ccache-$(version).tar.gz

generated_docs = ccache.1 INSTALL.html manual.html NEWS.html README.html
generated_docs = \
ccache.1 AUTHORS.html INSTALL.html LICENSE.html MANUAL.html NEWS.html \
README.html
built_dist_files = $(generated_docs)

headers = \
Expand All @@ -29,8 +31,8 @@ files_to_clean += *.xml

source_dist_files = \
main.c $(base_sources) $(test_sources) $(headers) zlib/*.c zlib/*.h \
config.h.in configure install-sh Makefile.in \
test.sh COPYING INSTALL.txt NEWS.txt README.txt
config.h.in configure install-sh Makefile.in test.sh \
AUTHORS.txt GPL-3.0.txt INSTALL.txt LICENSE.txt NEWS.txt README.txt
dist_files = \
$(addprefix $(srcdir)/, $(source_dist_files)) \
$(built_dist_files)
Expand Down Expand Up @@ -82,7 +84,7 @@ docs: $(generated_docs)
%.xml: %.txt
$(ASCIIDOC) -a revnumber=$(version) -d manpage -b docbook $<

ccache.1: manual.xml
ccache.1: MANUAL.xml
$(XSLTPROC) --nonet $(MANPAGE_XSL) $<

.PHONY: check-syntax
Expand Down
3 changes: 3 additions & 0 deletions m4/feature_macros.m4
@@ -1,5 +1,8 @@
dnl ===========================================================================
dnl Feature macro stuff borrowed from Python's configure.in
dnl
dnl For license information, see
dnl <http://www.python.org/download/releases/2.6.2/license/>.
dnl ===========================================================================

# The later defininition of _XOPEN_SOURCE disables certain features
Expand Down
5 changes: 0 additions & 5 deletions packaging/README

This file was deleted.

37 changes: 0 additions & 37 deletions packaging/ccache.spec

This file was deleted.

0 comments on commit 4aaa6a1

Please sign in to comment.