You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2012/11/18 17:49:46 UTC
[39/50] git commit: Cleaning up for distcheck
Cleaning up for distcheck
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bb40ec48
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bb40ec48
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bb40ec48
Branch: refs/heads/docs_tmp
Commit: bb40ec48d86408cae0c1ea2acf54545b7985c410
Parents: a85fadb
Author: Noah Slater <ns...@apache.org>
Authored: Sat Oct 13 20:35:35 2012 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Nov 18 00:15:30 2012 +0000
----------------------------------------------------------------------
Makefile.am | 2 +-
license.skip | 76 +++++++++++++++++++++----------------------
test/etap/Makefile.am | 1 +
3 files changed, 39 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb40ec48/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 49901a6..56f0fe1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,7 +162,7 @@ dist-hook:
distcheck-hook:
grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \
- | grep -vEf license.skip; \
+ | grep --include= -vEf license.skip; \
test "$$?" -eq 1
.PHONY: distsign
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb40ec48/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 9356ed0..d813a2c 100644
--- a/license.skip
+++ b/license.skip
@@ -1,4 +1,4 @@
-\.DS_Store
+^.*.DS_Store
^AUTHORS
^BUGS
^CHANGES
@@ -18,26 +18,26 @@
^README
^THANKS
^aclocal.m4
-^apache-couchdb-*
-^autom4te.cache/*
+^apache-couchdb-.*
+^autom4te.cache/.*
^bin/Makefile
^bin/Makefile.in
^bin/couchdb.1
^bin/couchjs.1
-^build-aux/*
-^config.*
+^build-aux/.*
+^config..*
^configure
^couchdb.stderr
^couchdb.stdout
-^cover/.*\.coverdata
-^cover/.*\.html
+^cover/.*.coverdata
+^cover/.*.html
^erl_crash.dump
^etc/Makefile
^etc/Makefile.in
^etc/couchdb/Makefile
^etc/couchdb/Makefile.in
-^etc/couchdb/default*
-^etc/couchdb/local*
+^etc/couchdb/default.*
+^etc/couchdb/local.*
^etc/default/Makefile
^etc/default/Makefile.in
^etc/default/couchdb
@@ -45,83 +45,81 @@
^etc/init/Makefile.in
^etc/launchd/Makefile
^etc/launchd/Makefile.in
-^etc/launchd/org.apache.couchdb.plist.*
+^etc/launchd/org.apache.couchdb.plist
^etc/logrotate.d/Makefile
^etc/logrotate.d/Makefile.in
-^etc/logrotate.d/couchdb*
+^etc/logrotate.d/couchdb.*
^etc/windows/Makefile
^etc/windows/README.txt.tpl
^libtool
^license.skip
-^m4/*
+^m4/.*
^share/Makefile
^share/Makefile.in
^share/doc/Makefile
^share/doc/Makefile.in
-^share/doc/build/Makefile
-^share/doc/build/Makefile.in
-^share/doc/images/*
+^share/doc/build/.*
+^share/doc/images/.*
^share/server/json2.js
^share/server/mimeparse.js
^share/server/coffee-script.js
^share/www/favicon.ico
-^share/www/image/*
-^share/www/script/jquery.*
+^share/www/image/.*
+^share/www/script/jquery..*
^share/www/script/json2.js
-^share/www/script/jspec/*
+^share/www/script/jspec/.*
^share/www/script/sha1.js
^share/www/script/base64.js
-^share/www/script/test/lorem*
+^share/www/script/test/lorem.*
^share/www/style/jquery-ui-1.8.11.custom.css
^src/Makefile
^src/Makefile.in
^src/couch_index/Makefile
^src/couch_index/Makefile.in
-^src/couch_index/ebin/.*beam
+^src/couch_index/ebin/.*.beam
^src/couch_mrview/Makefile
^src/couch_mrview/Makefile.in
-^src/couch_mrview/ebin/.*beam
+^src/couch_mrview/ebin/.*.beam
^src/couch_replicator/Makefile
^src/couch_replicator/Makefile.in
-^src/couch_replicator/ebin/.*beam
-^src/couchdb/.*beam
-^src/couchdb/.deps/*
+^src/couch_replicator/ebin/.*.beam
+^src/couchdb/.*.beam
+^src/couchdb/.deps/.*
^src/couchdb/Makefile
^src/couchdb/Makefile.in
-^src/couchdb/couch.app*
-^src/couchdb/couch.app.tpl.in
-^src/couchdb/priv/.*o
-^src/couchdb/priv/.deps/*
+^src/couchdb/couch.app.*
+^src/couchdb/priv/.*.o
+^src/couchdb/priv/.deps/.*
^src/couchdb/priv/Makefile
^src/couchdb/priv/Makefile.in
^src/couchdb/priv/couch_icu_driver.la
^src/couchdb/priv/couchjs
^src/couchdb/priv/couchspawnkillable
^src/couchdb/priv/stat_descriptions.cfg
-^src/erlang-oauth/*
-^src/ejson/*
-^src/etap/*
-^src/ibrowse/*
-^src/mochiweb/*
-^src/snappy/*
+^src/erlang-oauth/.*
+^src/ejson/.*
+^src/etap/.*
+^src/ibrowse/.*
+^src/mochiweb/.*
+^src/snappy/.*
^stamp-h1
^test/Makefile
^test/Makefile.in
^test/bench/Makefile
^test/bench/Makefile.in
-^test/etap/.*beam
-^test/etap/.*\.o
-^test/etap/.deps/*
+^test/etap/.*.beam
+^test/etap/.*.o
+^test/etap/.deps/.*
^test/etap/test_cfg_register
^test/etap/Makefile
^test/etap/Makefile.in
-^test/etap/temp.*
+^test/etap/temp..*
^test/javascript/Makefile
^test/javascript/Makefile.in
^test/local.ini
^test/view_server/Makefile
^test/view_server/Makefile.in
-^tmp/*
+^tmp/.*
^utils/Makefile
^utils/Makefile.in
^var/Makefile
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb40ec48/test/etap/Makefile.am
----------------------------------------------------------------------
diff --git a/test/etap/Makefile.am b/test/etap/Makefile.am
index c969758..3acdb85 100644
--- a/test/etap/Makefile.am
+++ b/test/etap/Makefile.am
@@ -26,6 +26,7 @@ run: run.tpl
$@ < $<
chmod +x $@
+# @@ wildcards are NOT portable, please replace with clean-local rules
CLEANFILES = run *.beam
DISTCLEANFILES = temp.*