couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [1/2] couchdb commit: updated refs/heads/1843-feature-bigcouch to 28730f6
Date Tue, 20 May 2014 13:32:04 GMT
Repository: couchdb
Updated Branches:
  refs/heads/1843-feature-bigcouch 6ed362998 -> 28730f64a


Remove 'make dev'


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

Branch: refs/heads/1843-feature-bigcouch
Commit: cb182c206f3d31a6a1866d6fc6d5e02c1b161c29
Parents: 6ed3629
Author: Robert Newson <rnewson@apache.org>
Authored: Mon May 19 16:37:51 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Mon May 19 16:37:51 2014 +0100

----------------------------------------------------------------------
 Makefile  | 20 --------------------
 configure | 27 ---------------------------
 2 files changed, 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cb182c20/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 4e3c3d0..84aab6b 100644
--- a/Makefile
+++ b/Makefile
@@ -48,25 +48,5 @@ install.mk:
 	@echo "No install.mk found. Run ./configure"
 	@exit 1
 
-dev: compile
-	@rm -rf rel/dev1 rel/dev2 rel/dev3
-	@echo "==> Building development node #1 (ports 15984/15986)"
-	@rebar generate target_dir=dev1 overlay_vars=dev1.config
-	@echo "==> Building development node #2 (ports 25984/25986)"
-	@rebar generate target_dir=dev2 overlay_vars=dev2.config
-	@echo "==> Building development node #3 (ports 35984/35986)"
-	@rebar generate target_dir=dev3 overlay_vars=dev3.config
-	@echo "\n\
-Development nodes are built, and can be started using ./rel/dev[123]/bin/couchdb.\n\
-Once the nodes are started, they must be joined together by editing the local\n\
-nodes DB. For example, executing\n\
-\n\
-    curl localhost:15986/nodes/dev2@127.0.0.1 -X PUT -d '{}'\n\
-    curl localhost:15986/nodes/dev3@127.0.0.1 -X PUT -d '{}'\n\
-\n\
-will cause node 1 to immediately connect to nodes 2 and 3 and form a cluster.\n\
-The content of the nodes database is continuously replicated throughout the\n\
-cluster, so this is a one-time operation.\n"
-
 docker:
 	@docker build --no-cache --rm -t couchdb/1843-feature-bigcouch .

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cb182c20/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 451d5ae..e6a5e8c 100755
--- a/configure
+++ b/configure
@@ -131,32 +131,5 @@ cat > $rootdir/config.erl << EOF
 {with_curl, $WITH_CURL}.
 EOF
 
-# finally, a few config files for local development nodes
-for i in 1 2 3; do
-cat > rel/dev$i.config << EOF
-% 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.
-%
-% The contents of this file are auto-generated by configure
-%
-{prefix, "$rootdir/rel/dev$i"}.
-{data_dir, "$rootdir/rel/tmpdata/dev$i"}.
-{view_dir, "$rootdir/rel/tmpdata/dev$i"}.
-{node_name, "-name dev$i@127.0.0.1"}.
-{cluster_port, `expr 10000 \* $i + 5984`}.
-{backend_port, `expr 10000 \* $i + 5986`}.
-EOF
-done
-
-
 echo "==> updating dependencies"
 rebar get-deps update-deps


Mime
View raw message