From 69d1f1d09a68243b4d0ce6e4db869d6b9758c537 Mon Sep 17 00:00:00 2001 From: Noah Slater Date: Tue, 14 Jul 2009 19:36:12 +0000 Subject: added licence check, and licence.skip git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@794030 13f79535-47bb-0310-9956-ffa450edef68 --- Makefile.am | 5 ++++ bin/couchdb.tpl.in | 4 +-- licence.skip | 50 +++++++++++++++++++++++++++++++++++++ share/www/_sidebar.html | 14 +++++++++++ share/www/index.html | 4 +-- src/couchdb/couch_db.erl | 4 +-- test/couch_config_test.erl | 17 ++++++++++--- test/couch_config_writer_test.erl | 12 +++++++++ test/etap/001-load.t | 12 +++++++++ test/etap/010-file-basics.t | 12 +++++++++ test/etap/011-file-headers.t | 12 +++++++++ test/etap/020-btree-basics.t | 12 +++++++++ test/etap/021-btree-reductions.t | 12 +++++++++ test/etap/030-doc-from-json.t | 11 ++++++++ test/etap/031-doc-to-json.t | 11 ++++++++ test/etap/040-util.t | 22 ++++++++++++---- test/etap/050-stream.t | 12 +++++++++ test/etap/060-kt-merging.t | 12 +++++++++ test/etap/061-kt-missing-leaves.t | 12 +++++++++ test/etap/062-kt-remove-leaves.t | 12 +++++++++ test/etap/063-kt-get-leaves.t | 12 +++++++++ test/etap/064-kt-counting.t | 12 +++++++++ test/etap/065-kt-stemming.t | 12 +++++++++ test/etap/070-couch-db.t | 12 +++++++++ test/etap/080-config-get-set.t | 12 +++++++++ test/etap/081-config-override.2.ini | 2 +- test/etap/081-config-override.t | 12 +++++++++ test/etap/082-config-register.t | 12 +++++++++ test/etap/083-config-no-files.t | 12 +++++++++ test/etap/090-task-status.t | 12 +++++++++ test/etap/100-ref-counter.t | 12 +++++++++ test/runner.erl | 12 +++++++++ test/runner.sh | 18 ++++++++++++- 33 files changed, 398 insertions(+), 16 deletions(-) create mode 100644 licence.skip diff --git a/Makefile.am b/Makefile.am index 2ba55310..5a81a6c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,11 @@ local-clean: maintainer-clean rm -fr $(top_srcdir)/tmp find $(top_srcdir) -name Makefile.in -exec rm {} \; +distcheck-hook: + grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \ + | grep -vf licence.skip; \ + test "$$?" -eq 1 + .PHONY: distsign distsign: distcheck gpg --armor --detach-sig \ diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index ed1c2f6e..56d4e595 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -1,14 +1,14 @@ #! /bin/sh -e # Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of +# use this file except in compliance with the License. You may obtain a copy of # the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations under # the License. diff --git a/licence.skip b/licence.skip new file mode 100644 index 00000000..c1328374 --- /dev/null +++ b/licence.skip @@ -0,0 +1,50 @@ +aclocal.m4 +AUTHORS +autom4te.cache/* +bin/couchdb.1 +bin/couchjs.1 +BUGS +build-aux/* +CHANGES +check.except +config.* +configure +etc/couchdb/default* +etc/couchdb/local* +etc/default/couchdb +etc/launchd/org.apache.couchdb.plist.* +etc/logrotate.d/couchdb* +libtool +m4/ac_check_curl.m4* +m4/ac_check_icu.m4* +Makefile +Makefile.in +NEWS +NOTICE +README +share/Makefile +share/Makefile.in +share/www/favicon.ico +share/www/image/* +share/www/script/jquery.* +share/www/script/json2.js +share/www/script/test/lorem.txt +src/couchdb/*.beam +src/couchdb/couch.app.tpl.in +src/couchdb/.deps/* +src/couchdb/.libs/* +src/couchdb/Makefile +src/couchdb/Makefile.in +src/couchdb/*.o +src/ibrowse/* +src/mochiweb/* +stamp-h1 +test/etap/081-config-override.1.ini +test/etap/081-config-override.2.ini +test/Makefile +test/Makefile.in +THANKS +utils/Makefile +utils/Makefile.in +var/Makefile +var/Makefile.in diff --git a/share/www/_sidebar.html b/share/www/_sidebar.html index 670a8e54..97843f88 100644 --- a/share/www/_sidebar.html +++ b/share/www/_sidebar.html @@ -1,3 +1,17 @@ +