You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/08/02 22:08:51 UTC
[37/49] git commit: updated refs/heads/1867-feature-plugins to d269b53
add more license, update license.skip, fix `make distcheck`
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/46ac6d0f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/46ac6d0f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/46ac6d0f
Branch: refs/heads/1867-feature-plugins
Commit: 46ac6d0f2b84f094d6f7f42aaae6ae979b107ba0
Parents: f5d2311
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jul 31 20:04:48 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Aug 2 21:17:04 2013 +0200
----------------------------------------------------------------------
.gitignore | 1 +
configure.ac | 1 +
license.skip | 4 +++
src/Makefile.am | 1 +
src/couch_plugins/Makefile.am | 39 ++++++++++++++++++++++
src/couch_plugins/src/couch_plugins.app.src | 11 ++++++
src/couch_plugins/src/couch_plugins_httpd.erl | 2 +-
7 files changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/46ac6d0f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index c1ece09..913fe88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@ share/doc/build/texinfo
share/server/main-coffee.js
share/server/main.js
src/couch_mrview/ebin/
+src/couch_plugins/ebin/
src/couch_replicator/ebin/
src/couchdb/.deps/*
src/couchdb/.libs/*
http://git-wip-us.apache.org/repos/asf/couchdb/blob/46ac6d0f/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index fec0441..bb3ef38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -727,6 +727,7 @@ AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([src/couch_dbupdates/Makefile])
AC_CONFIG_FILES([src/couch_index/Makefile])
AC_CONFIG_FILES([src/couch_mrview/Makefile])
+AC_CONFIG_FILES([src/couch_plugins/Makefile])
AC_CONFIG_FILES([src/couch_replicator/Makefile])
AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
AC_CONFIG_FILES([src/couchdb/Makefile])
http://git-wip-us.apache.org/repos/asf/couchdb/blob/46ac6d0f/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index b398ff7..cd0468e 100644
--- a/license.skip
+++ b/license.skip
@@ -81,6 +81,10 @@
^src/couch_mrview/Makefile
^src/couch_mrview/Makefile.in
^src/couch_mrview/ebin/.*.beam
+^src/couch_plugins/README.md
+^src/couch_plugins/Makefile
+^src/couch_plugins/Makefile.in
+^src/couch_plugins/ebin/.*.beam
^src/couch_replicator/Makefile
^src/couch_replicator/Makefile.in
^src/couch_replicator/ebin/.*.beam
http://git-wip-us.apache.org/repos/asf/couchdb/blob/46ac6d0f/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b11e15..c500e11 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,6 +14,7 @@ SUBDIRS = \
couch_dbupdates \
couch_index \
couch_mrview \
+ couch_plugins \
couch_replicator \
couchdb \
ejson \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/46ac6d0f/src/couch_plugins/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couch_plugins/Makefile.am b/src/couch_plugins/Makefile.am
new file mode 100644
index 0000000..300f19c
--- /dev/null
+++ b/src/couch_plugins/Makefile.am
@@ -0,0 +1,39 @@
+## 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
+## 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
+## License for the specific language governing permissions and limitations under
+## the License.
+
+couch_pluginsebindir = $(couch_pluginslibdir)/ebin
+
+couch_pluginsebin_DATA = $(compiled_files)
+
+
+source_files = \
+ src/couch_plugins.app.src \
+ src/couch_plugins.erl \
+ src/couch_plugins_httpd.erl
+
+compiled_files = \
+ ebin/couch_plugins.app \
+ ebin/couch_plugins.beam \
+ ebin/couch_plugins_httpd.beam
+
+EXTRA_DIST = $(source_files)
+CLEANFILES = $(compiled_files)
+
+ebin/%.app: src/%.app.src
+ @mkdir -p ebin/
+ sed -e "s|%version%|@version@|g" \
+ < $< > $@
+
+ebin/%.beam: src/%.erl $(include_files)
+ @mkdir -p ebin/
+ $(ERLC) -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/couchdb \
+ -o ebin/ $(ERLC_FLAGS) ${TEST} $<;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/46ac6d0f/src/couch_plugins/src/couch_plugins.app.src
----------------------------------------------------------------------
diff --git a/src/couch_plugins/src/couch_plugins.app.src b/src/couch_plugins/src/couch_plugins.app.src
index 059663c..d961289 100644
--- a/src/couch_plugins/src/couch_plugins.app.src
+++ b/src/couch_plugins/src/couch_plugins.app.src
@@ -1,3 +1,14 @@
+% 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
+% 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
+% License for the specific language governing permissions and limitations under
+% the License.
{application, couch_plugins,
[
{description, "A CouchDB Plugin Installer"},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/46ac6d0f/src/couch_plugins/src/couch_plugins_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_plugins/src/couch_plugins_httpd.erl b/src/couch_plugins/src/couch_plugins_httpd.erl
index 12f65f3..7a450f4 100644
--- a/src/couch_plugins/src/couch_plugins_httpd.erl
+++ b/src/couch_plugins/src/couch_plugins_httpd.erl
@@ -29,7 +29,7 @@ handle_req(#httpd{method='POST'}=Req) ->
{binary_to_list(K), binary_to_list(V)}
end, Checksums0),
- case couch_plugins:install({Name, Url, Version, Checksums}}) of
+ case couch_plugins:install({Name, Url, Version, Checksums}) of
ok ->
couch_httpd:send_json(Req, 202, {[{ok, true}]});
Error ->