You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/13 18:39:23 UTC
couch-plugins commit: updated refs/heads/1994-merge-rcouch to 990a530
Updated Branches:
refs/heads/1994-merge-rcouch [created] 990a530c8
fix include.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-plugins/commit/990a530c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-plugins/tree/990a530c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-plugins/diff/990a530c
Branch: refs/heads/1994-merge-rcouch
Commit: 990a530c81530a579fef86e977df08622e1ded8d
Parents: 2ee6321
Author: benoitc <bc...@gmail.com>
Authored: Thu Feb 13 18:38:48 2014 +0100
Committer: benoitc <bc...@gmail.com>
Committed: Thu Feb 13 18:38:48 2014 +0100
----------------------------------------------------------------------
Makefile.am | 40 ----------------------------------------
src/couch_plugins.app.src | 2 +-
src/couch_plugins.erl | 4 +++-
src/couch_plugins_httpd.erl | 4 ++--
4 files changed, 6 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-plugins/blob/990a530c/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 37cd9d5..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-## 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_pluginslibdir = $(localerlanglibdir)/couch_plugins-0.1
-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) README.md
-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-couch-plugins/blob/990a530c/src/couch_plugins.app.src
----------------------------------------------------------------------
diff --git a/src/couch_plugins.app.src b/src/couch_plugins.app.src
index d961289..4c10346 100644
--- a/src/couch_plugins.app.src
+++ b/src/couch_plugins.app.src
@@ -12,7 +12,7 @@
{application, couch_plugins,
[
{description, "A CouchDB Plugin Installer"},
- {vsn, "1"},
+ {vsn, "0.1"},
{registered, []},
{applications, [
kernel,
http://git-wip-us.apache.org/repos/asf/couchdb-couch-plugins/blob/990a530c/src/couch_plugins.erl
----------------------------------------------------------------------
diff --git a/src/couch_plugins.erl b/src/couch_plugins.erl
index a4950be..e375c24 100644
--- a/src/couch_plugins.erl
+++ b/src/couch_plugins.erl
@@ -10,9 +10,11 @@
% License for the specific language governing permissions and limitations under
% the License.
-module(couch_plugins).
--include("couch_db.hrl").
+
-export([install/1, uninstall/1]).
+-include_lib("couch/include/couch_db.hrl").
+
% couch_plugins:install({"geocouch", "http://127.0.0.1:8000", "1.0.0", [{"R15B03", "+XOJP6GSzmuO2qKdnjO+mWckXVs="}]}).
% couch_plugins:install({"geocouch", "http://people.apache.org/~jan/", "couchdb1.2.x_v0.3.0-11-gd83ba22", [{"R15B03", "ZetgdHj2bY2w37buulWVf3USOZs="}]}).
http://git-wip-us.apache.org/repos/asf/couchdb-couch-plugins/blob/990a530c/src/couch_plugins_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_plugins_httpd.erl b/src/couch_plugins_httpd.erl
index 83fd916..4dabbb4 100644
--- a/src/couch_plugins_httpd.erl
+++ b/src/couch_plugins_httpd.erl
@@ -13,7 +13,7 @@
-export([handle_req/1]).
--include_lib("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
handle_req(#httpd{method='POST'}=Req) ->
ok = couch_httpd:verify_is_server_admin(Req),
@@ -62,4 +62,4 @@ parse_checksums(Checksums) ->
{binary_to_list(K), parse_checksums(V)};
({K, V}) ->
{binary_to_list(K), binary_to_list(V)}
- end, Checksums).
\ No newline at end of file
+ end, Checksums).