couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [1/6] couch-replicator commit: updated refs/heads/integration to ea59d11
Date Mon, 12 May 2014 15:16:50 GMT
Repository: couchdb-couch-replicator
Updated Branches:
  refs/heads/integration [created] ea59d11a8


Fix build system


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/f7028ca8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/f7028ca8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/f7028ca8

Branch: refs/heads/integration
Commit: f7028ca885955ec73516e0068aebd4ab4182260c
Parents: 53e6dbe
Author: Robert Newson <rnewson@apache.org>
Authored: Mon May 12 13:04:59 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Mon May 12 15:56:28 2014 +0100

----------------------------------------------------------------------
 Makefile.am                  |  76 --------------------------------------
 rebar                        | Bin 100732 -> 0 bytes
 rebar.config                 |  17 ---------
 src/couch_replicator.app.src |   4 +-
 4 files changed, 2 insertions(+), 95 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/f7028ca8/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index ea5d117..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,76 +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_replicatorlibdir = $(localerlanglibdir)/couch_replicator-0.1
-couch_replicatorincludedir = $(couch_replicatorlibdir)/include
-couch_replicatorebindir = $(couch_replicatorlibdir)/ebin
-
-couch_replicatorinclude_DATA = $(include_files)
-couch_replicatorebin_DATA = $(compiled_files)
-
-include_files = \
-	src/couch_replicator_api_wrap.hrl \
-	src/couch_replicator.hrl \
-	src/couch_replicator_js_functions.hrl
-
-source_files = \
-	src/couch_replicator_api_wrap.erl \
-	src/couch_replicator_httpc_pool.erl \
-	src/couch_replicator_httpc.erl \
-	src/couch_replicator_httpd.erl \
-	src/couch_replicator_job_sup.erl \
-	src/couch_replicator_notifier.erl \
-	src/couch_replicator_manager.erl \
-	src/couch_replicator_utils.erl \
-	src/couch_replicator_worker.erl \
-	src/couch_replicator.app.src \
-	src/couch_replicator.erl
-
-test_files = \
-	test/01-load.t \
-	test/02-httpc-pool.t \
-	test/03-replication-compact.t \
-	test/04-replication-large-atts.t \
-	test/05-replication-many-leaves.t \
-	test/06-doc-missing-stubs.t
-
-compiled_files = \
-	ebin/couch_replicator_api_wrap.beam \
-	ebin/couch_replicator_httpc_pool.beam \
-	ebin/couch_replicator_httpc.beam \
-	ebin/couch_replicator_httpd.beam \
-	ebin/couch_replicator_job_sup.beam \
-	ebin/couch_replicator_notifier.beam \
-	ebin/couch_replicator_manager.beam \
-	ebin/couch_replicator_utils.beam \
-	ebin/couch_replicator_worker.beam \
-	ebin/couch_replicator.app \
-	ebin/couch_replicator.beam
-
-EXTRA_DIST = $(include_files) $(source_files) $(test_files)
-CLEANFILES = $(compiled_files)
-
-check:
-if TESTS
-	$(abs_top_builddir)/test/etap/run $(abs_top_srcdir)/src/couch_replicator/test
-endif
-
-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 -o ebin/ $(ERLC_FLAGS) ${TEST} $<;
-
-

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/f7028ca8/rebar
----------------------------------------------------------------------
diff --git a/rebar b/rebar
deleted file mode 100755
index 30c43ba..0000000
Binary files a/rebar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/f7028ca8/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
deleted file mode 100644
index 4af6b85..0000000
--- a/rebar.config
+++ /dev/null
@@ -1,17 +0,0 @@
-% Copyright 2011 Cloudant
-%
-% 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.
-
-{deps, [
-    {twig, ".*", {git, "https://github.com/cloudant/twig.git", {tag, "0.2.1"}}}
-]}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/f7028ca8/src/couch_replicator.app.src
----------------------------------------------------------------------
diff --git a/src/couch_replicator.app.src b/src/couch_replicator.app.src
index bd6b3e3..08d4f5b 100644
--- a/src/couch_replicator.app.src
+++ b/src/couch_replicator.app.src
@@ -12,7 +12,7 @@
 
 {application, couch_replicator, [
     {description, "CouchDB replicator"},
-    {vsn, "%version%"},
+    {vsn, git},
     {modules, [
         couch_replicator,
         couch_replicator_api_wrap,
@@ -28,7 +28,7 @@
         couch_replicator_worker
     ]},
     {registered, [
-        couch_replication,
+        couch_replicator,
         couch_replicator_manager,
         couch_replicator_job_sup
     ]},


Mime
View raw message