Updated Branches:
  refs/heads/1843-feature-bigcouch 654a9947d -> 465d1ad73 (forced update)


http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/rebar/test/upgrade_project/rel/files/nodetool
----------------------------------------------------------------------
diff --git a/src/rebar/test/upgrade_project/rel/files/nodetool 
b/src/rebar/test/upgrade_project/rel/files/nodetool
deleted file mode 100644
index ce06c6a..0000000
--- a/src/rebar/test/upgrade_project/rel/files/nodetool
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/usr/bin/env escript
-%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
-%% ex: ft=erlang ts=4 sw=4 et
-%% -------------------------------------------------------------------
-%%
-%% nodetool: Helper Script for interacting with live nodes
-%%
-%% -------------------------------------------------------------------
-main(Args) ->
-    ok = start_epmd(),
-    %% Extract the args
-    {RestArgs, TargetNode} = process_args(Args, [], undefined),
-
-    %% any commands that don't need a running node
-    case RestArgs of
-        ["chkconfig", File] ->
-            case file:consult(File) of
-                {ok, _} ->
-                    io:format("ok\n"),
-                    halt(0);
-                {error, {Line, Mod, Term}} ->
-                    io:format(standard_error, ["Error on line ",
-                              file:format_error({Line, Mod, Term}), "\n"], []),
-                    halt(1);
-                {error, R} ->
-                    io:format(standard_error, ["Error reading config file: ",
-                              file:format_error(R), "\n"], []),
-                    halt(1)
-            end;
-        _ ->
-            ok
-    end,
-
-    %% See if the node is currently running  -- if it's not, we'll bail
-    case {net_kernel:hidden_connect_node(TargetNode),
-          net_adm:ping(TargetNode)} of
-        {true, pong} ->
-            ok;
-        {false,pong} ->
-            io:format("Failed to connect to node ~p .\n", [TargetNode]),
-            halt(1);
-        {_, pang} ->
-            io:format("Node ~p not responding to pings.\n", [TargetNode]),
-            halt(1)
-    end,
-
-    case RestArgs of
-        ["getpid"] ->
-            io:format("~p\n",
-                      [list_to_integer(rpc:call(TargetNode, os, getpid, []))]);
-        ["ping"] ->
-            %% If we got this far, the node already responsed to a
-            %% ping, so just dump a "pong"
-            io:format("pong\n");
-        ["stop"] ->
-            io:format("~p\n", [rpc:call(TargetNode, init, stop, [], 60000)]);
-        ["restart"] ->
-            io:format("~p\n", [rpc:call(TargetNode, init, restart, [], 
60000)]);
-        ["reboot"] ->
-            io:format("~p\n", [rpc:call(TargetNode, init, reboot, [], 60000)]);
-        ["rpc", Module, Function | RpcArgs] ->
-            case rpc:call(TargetNode,
-                          list_to_atom(Module),
-                          list_to_atom(Function),
-                          [RpcArgs], 60000) of
-                ok ->
-                    ok;
-                {badrpc, Reason} ->
-                    io:format("RPC to ~p failed: ~p\n", [TargetNode, Reason]),
-                    halt(1);
-                _ ->
-                    halt(1)
-            end;
-        ["rpc_infinity", Module, Function | RpcArgs] ->
-            case rpc:call(TargetNode,
-                          list_to_atom(Module),
-                          list_to_atom(Function),
-                          [RpcArgs], infinity) of
-                ok ->
-                    ok;
-                {badrpc, Reason} ->
-                    io:format("RPC to ~p failed: ~p\n", [TargetNode, Reason]),
-                    halt(1);
-                _ ->
-                    halt(1)
-            end;
-        ["rpcterms", Module, Function, ArgsAsString] ->
-            case rpc:call(TargetNode,
-                          list_to_atom(Module),
-                          list_to_atom(Function),
-                          consult(ArgsAsString), 60000) of
-                {badrpc, Reason} ->
-                    io:format("RPC to ~p failed: ~p\n", [TargetNode, Reason]),
-                    halt(1);
-                Other ->
-                    io:format("~p\n", [Other])
-            end;
-        Other ->
-            io:format("Other: ~p\n", [Other]),
-            io:format("Usage: nodetool 
{chkconfig|getpid|ping|stop|restart|reboot|rpc|rpc_infinity|rpcterms}\n")
-    end,
-    net_kernel:stop().
-
-process_args([], Acc, TargetNode) ->
-    {lists:reverse(Acc), TargetNode};
-process_args(["-setcookie", Cookie | Rest], Acc, TargetNode) ->
-    erlang:set_cookie(node(), list_to_atom(Cookie)),
-    process_args(Rest, Acc, TargetNode);
-process_args(["-name", TargetName | Rest], Acc, _) ->
-    ThisNode = append_node_suffix(TargetName, "_maint_"),
-    {ok, _} = net_kernel:start([ThisNode, longnames]),
-    process_args(Rest, Acc, nodename(TargetName));
-process_args(["-sname", TargetName | Rest], Acc, _) ->
-    ThisNode = append_node_suffix(TargetName, "_maint_"),
-    {ok, _} = net_kernel:start([ThisNode, shortnames]),
-    process_args(Rest, Acc, nodename(TargetName));
-process_args([Arg | Rest], Acc, Opts) ->
-    process_args(Rest, [Arg | Acc], Opts).
-
-
-start_epmd() ->
-    [] = os:cmd(epmd_path() ++ " -daemon"),
-    ok.
-
-epmd_path() ->
-    ErtsBinDir = filename:dirname(escript:script_name()),
-    Name = "epmd",
-    case os:find_executable(Name, ErtsBinDir) of
-        false ->
-            case os:find_executable(Name) of
-                false ->
-                    io:format("Could not find epmd.~n"),
-                    halt(1);
-                GlobalEpmd ->
-                    GlobalEpmd
-            end;
-        Epmd ->
-            Epmd
-    end.
-
-
-nodename(Name) ->
-    case string:tokens(Name, "@") of
-        [_Node, _Host] ->
-            list_to_atom(Name);
-        [Node] ->
-            [_, Host] = string:tokens(atom_to_list(node()), "@"),
-            list_to_atom(lists:concat([Node, "@", Host]))
-    end.
-
-append_node_suffix(Name, Suffix) ->
-    case string:tokens(Name, "@") of
-        [Node, Host] ->
-            list_to_atom(lists:concat([Node, Suffix, os:getpid(), "@", Host]));
-        [Node] ->
-            list_to_atom(lists:concat([Node, Suffix, os:getpid()]))
-    end.
-
-
-%%
-%% Given a string or binary, parse it into a list of terms, ala file:consult/0
-%%
-consult(Str) when is_list(Str) ->
-    consult([], Str, []);
-consult(Bin) when is_binary(Bin)->
-    consult([], binary_to_list(Bin), []).
-
-consult(Cont, Str, Acc) ->
-    case erl_scan:tokens(Cont, Str, 0) of
-        {done, Result, Remaining} ->
-            case Result of
-                {ok, Tokens, _} ->
-                    {ok, Term} = erl_parse:parse_term(Tokens),
-                    consult([], Remaining, [Term | Acc]);
-                {eof, _Other} ->
-                    lists:reverse(Acc);
-                {error, Info, _} ->
-                    {error, Info}
-            end;
-        {more, Cont1} ->
-            consult(Cont1, eof, Acc)
-    end.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/rebar/test/upgrade_project/rel/files/sys.config
----------------------------------------------------------------------
diff --git a/src/rebar/test/upgrade_project/rel/files/sys.config 
b/src/rebar/test/upgrade_project/rel/files/sys.config
deleted file mode 100644
index 3b7f6bd..0000000
--- a/src/rebar/test/upgrade_project/rel/files/sys.config
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- %% SASL config
- {sasl, [
-         {sasl_error_logger, {file, "log/sasl-error.log"}},
-         {errlog_type, error},
-         {error_logger_mf_dir, "log/sasl"},      % Log directory
-         {error_logger_mf_maxbytes, 10485760},   % 10 MB max file size
-         {error_logger_mf_maxfiles, 5}           % 5 files max
-        ]}
-].
-

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/rebar/test/upgrade_project/rel/files/vm.args
----------------------------------------------------------------------
diff --git a/src/rebar/test/upgrade_project/rel/files/vm.args 
b/src/rebar/test/upgrade_project/rel/files/vm.args
deleted file mode 100644
index a9aeb64..0000000
--- a/src/rebar/test/upgrade_project/rel/files/vm.args
+++ /dev/null
@@ -1,19 +0,0 @@
-## Name of the node
--name [email protected]
-
-## Cookie for distributed erlang
--setcookie dummy
-
-## Heartbeat management; auto-restarts VM if it dies or becomes unresponsive
-## (Disabled by default..use with caution!)
-##-heart
-
-## Enable kernel poll and a few async threads
-##+K true
-##+A 5
-
-## Increase number of concurrent ports/sockets
-##-env ERL_MAX_PORTS 4096
-
-## Tweak GC to run more often
-##-env ERL_FULLSWEEP_AFTER 10

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/rebar/test/upgrade_project/rel/reltool.config
----------------------------------------------------------------------
diff --git a/src/rebar/test/upgrade_project/rel/reltool.config 
b/src/rebar/test/upgrade_project/rel/reltool.config
deleted file mode 100644
index b691c77..0000000
--- a/src/rebar/test/upgrade_project/rel/reltool.config
+++ /dev/null
@@ -1,27 +0,0 @@
-{sys, [
-    {lib_dirs, ["../apps"]},
-    {rel, "dummy", "0.1", [
-        kernel,
-        stdlib,
-        sasl,
-        dummy
-    ]},
-    {rel, "start_clean", "", [kernel, stdlib]},
-    {boot_rel, "dummy"},
-    {profile, embedded},
-    {excl_sys_filters, ["^bin/.*", "^erts.*/bin/(dialyzer|typer)"]},
-    {excl_archive_filters, [".*"]},
-
-    {app, hipe, [{incl_cond, exclude}]},
-
-    {app, dummy, [{incl_cond, include}]}
-]}.
-
-{overlay, [
-          {mkdir, "log/sasl"},
-          {copy, "files/erl", "{{erts_vsn}}/bin/erl"},
-          {copy, "files/nodetool", "{{erts_vsn}}/bin/nodetool"},
-          {copy, "files/dummy", "bin/dummy"},
-          {copy, "files/sys.config", "releases/\{\{rel_vsn\}\}/sys.config"},
-          {copy, "files/vm.args", "releases/\{\{rel_vsn\}\}/vm.args"}
-          ]}.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/rexi/.gitignore
----------------------------------------------------------------------
diff --git a/src/rexi/.gitignore b/src/rexi/.gitignore
deleted file mode 100644
index 4f2f040..0000000
--- a/src/rexi/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# building
-ebin
-.eunit
-logs
-*.spec
-deps
-*.beam
-

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/rexi/Makefile.am
----------------------------------------------------------------------
diff --git a/src/rexi/Makefile.am b/src/rexi/Makefile.am
deleted file mode 100644
index e658627..0000000
--- a/src/rexi/Makefile.am
+++ /dev/null
@@ -1,48 +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.
-
-rexiebindir = $(localerlanglibdir)/rexi/ebin
-
-rexiebin_DATA = $(compiled_files)
-
-source_files = \
-       src/rexi.app.src \
-    src/rexi.erl \
-       src/rexi_app.erl \
-       src/rexi_gov_manager.erl \
-       src/rexi_governor.erl \
-       src/rexi_monitor.erl \
-       src/rexi_server.erl \
-       src/rexi_sup.erl \
-       src/rexi_utils.erl
-
-compiled_files = \
-       ebin/rexi.app \
-    ebin/rexi.beam \
-       ebin/rexi_app.beam \
-       ebin/rexi_gov_manager.beam \
-       ebin/rexi_governor.beam \
-       ebin/rexi_monitor.beam \
-       ebin/rexi_server.beam \
-       ebin/rexi_sup.beam \
-       ebin/rexi_utils.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
-       @mkdir -p ebin/
-       $(ERLC) -Wall -I$(top_srcdir)/src -o ebin/ $(ERLC_FLAGS) $<

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/rexi/src/rexi.app.src
----------------------------------------------------------------------
diff --git a/src/rexi/src/rexi.app.src b/src/rexi/src/rexi.app.src
index c9af9d0..0691edd 100644
--- a/src/rexi/src/rexi.app.src
+++ b/src/rexi/src/rexi.app.src
@@ -12,7 +12,7 @@
 
 {application, rexi, [
     {description, "Lightweight RPC server"},
-    {vsn, "%version%"},
+    {vsn, git},
     {modules, [
         rexi,
         rexi_app,

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/snappy/Makefile.am
----------------------------------------------------------------------
diff --git a/src/snappy/Makefile.am b/src/snappy/Makefile.am
deleted file mode 100644
index baa4f68..0000000
--- a/src/snappy/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.
-
-SUBDIRS = c_src
-
-snappyebindir = $(localerlanglibdir)/snappy-1.0.5/ebin
-
-snappy_file_collection = \
-    src/snappy.app.in \
-    src/snappy.erl
-
-snappyebin_make_generated_file_list = \
-    ebin/snappy.app \
-    ebin/snappy.beam
-
-snappyebin_DATA = \
-       $(snappyebin_make_generated_file_list)
-
-EXTRA_DIST = \
-    $(snappy_file_collection)
-
-CLEANFILES = \
-    $(snappyebin_make_generated_file_list)
-
-ebin/%.app: src/%.app.in
-       @mkdir -p ebin/
-       cp $< $@
-
-ebin/%.beam: src/%.erl
-       @mkdir -p ebin/
-       $(ERLC) -o ebin/ $(ERLC_FLAGS) $<

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/snappy/c_src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/snappy/c_src/Makefile.am b/src/snappy/c_src/Makefile.am
deleted file mode 100644
index 3a5d6cd..0000000
--- a/src/snappy/c_src/Makefile.am
+++ /dev/null
@@ -1,58 +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.
-
-snappyprivdir = $(localerlanglibdir)/snappy-1.0.5/priv
-
-snappy_cxx_srcs = \
-       snappy_nif.cc \
-       google-snappy/snappy.cc \
-       google-snappy/snappy-sinksource.cc \
-       google-snappy/snappy-stubs-internal.cc
-
-snappy_cxx_hdrs = \
-       erl_nif_compat.h \
-       google-snappy/snappy.h \
-       google-snappy/snappy-internal.h \
-       google-snappy/snappy-sinksource.h \
-       google-snappy/snappy-stubs-internal.h \
-       google-snappy/snappy-stubs-public.h.in
-
-EXTRA_DIST = \
-    google-snappy/AUTHORS \
-    google-snappy/COPYING \
-       $(snappy_cxx_hdrs)
-
-CLEANFILES = \
-       ../priv/snappy_nif.so
-
-if USE_OTP_NIFS
-snappypriv_LTLIBRARIES = snappy_nif.la
-snappy_nif_la_SOURCES = $(snappy_cxx_srcs)
-snappy_nif_la_CXXFLAGS = $(ERLANG_FLAGS)
-snappy_nif_la_LDFLAGS = -module -avoid-version
-
-if WINDOWS
-snappy_nif_la_LDFLAGS += -no-undefined
-snappy_nif_la_CXXFLAGS += -EHsc -Ox
-SNAPPY_SO_NAME = snappy_nif.dll
-else
-SNAPPY_SO_NAME = snappy_nif.so
-endif
-
-
-# This is purely to enable ./utils/run
-../priv/$(SNAPPY_SO_NAME): snappy_nif.la
-       @mkdir -p ../priv
-       cp .libs/$(SNAPPY_SO_NAME) $@
-
-all: ../priv/$(SNAPPY_SO_NAME)
-endif

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/snappy/src/snappy.app.in
----------------------------------------------------------------------
diff --git a/src/snappy/src/snappy.app.in b/src/snappy/src/snappy.app.in
deleted file mode 100644
index 25d37b5..0000000
--- a/src/snappy/src/snappy.app.in
+++ /dev/null
@@ -1,12 +0,0 @@
-{application, snappy,
- [
-  {description, "snappy compressor/decompressor Erlang NIF wrapper"},
-  {vsn, "1.0.5"},
-  {registered, []},
-  {applications, [
-                  kernel,
-                  stdlib
-                 ]},
-  {env, []},
-  {modules, [snappy]}
- ]}.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/snappy/src/snappy.app.src
----------------------------------------------------------------------
diff --git a/src/snappy/src/snappy.app.src b/src/snappy/src/snappy.app.src
new file mode 100644
index 0000000..9f3f9a3
--- /dev/null
+++ b/src/snappy/src/snappy.app.src
@@ -0,0 +1,12 @@
+{application, snappy,
+ [
+  {description, "snappy compressor/decompressor Erlang NIF wrapper"},
+  {vsn, git},
+  {registered, []},
+  {applications, [
+                  kernel,
+                  stdlib
+                 ]},
+  {env, []},
+  {modules, [snappy]}
+ ]}.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/twig/.gitignore
----------------------------------------------------------------------
diff --git a/src/twig/.gitignore b/src/twig/.gitignore
deleted file mode 100644
index 6308d7c..0000000
--- a/src/twig/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-ebin
-src/.*.swp
-.project

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/src/twig/Makefile.am
----------------------------------------------------------------------
diff --git a/src/twig/Makefile.am b/src/twig/Makefile.am
deleted file mode 100644
index 8832ce1..0000000
--- a/src/twig/Makefile.am
+++ /dev/null
@@ -1,49 +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.
-
-twigebindir = $(localerlanglibdir)/twig/ebin
-
-twigebin_DATA = $(compiled_files)
-
-include_files = \
-       twig_int.hrl
-
-source_files = \
-       src/twig.app.src \
-    src/twig.erl \
-       src/twig_app.erl \
-       src/twig_event_handler.erl \
-       src/twig_monitor.erl \
-       src/twig_sup.erl \
-       src/twig_util.erl \
-       src/trunc_io.erl
-
-compiled_files = \
-       ebin/twig.app \
-    ebin/twig.beam \
-       ebin/twig_app.beam \
-       ebin/twig_event_handler.beam \
-       ebin/twig_monitor.beam \
-       ebin/twig_sup.beam \
-       ebin/twig_util.beam \
-       ebin/trunc_io.beam
-
-EXTRA_DIST = $(include_files) $(source_files)
-CLEANFILES = $(compiled_files)
-
-ebin/%.app: src/%.app.src
-       @mkdir -p ebin/
-       sed -e "s|%version%|@version@|g" < $< > $@
-
-ebin/%.beam: src/%.erl
-       @mkdir -p ebin/
-       $(ERLC) -Wall -I$(top_srcdir)/src -o ebin/ $(ERLC_FLAGS) $<

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/test/Makefile.am
----------------------------------------------------------------------
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 7c70a5a..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,15 +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.
-
-SUBDIRS = bench etap javascript view_server
-EXTRA_DIST = random_port.ini
-

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/test/bench/Makefile.am
----------------------------------------------------------------------
diff --git a/test/bench/Makefile.am b/test/bench/Makefile.am
deleted file mode 100644
index ce39c4b..0000000
--- a/test/bench/Makefile.am
+++ /dev/null
@@ -1,22 +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.
-
-EXTRA_DIST = benchbulk.sh bench_marks.js run.tpl
-
-noinst_SCRIPTS = run
-CLEANFILES = run
-
-run: run.tpl
-       sed -e "s|%abs_top_srcdir%|$(abs_top_srcdir)|" \
-               -e "s|%abs_top_builddir%|$(abs_top_builddir)|" \
-       < $< > $@
-       chmod +x $@

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/test/etap/Makefile.am
----------------------------------------------------------------------
diff --git a/test/etap/Makefile.am b/test/etap/Makefile.am
deleted file mode 100644
index c092805..0000000
--- a/test/etap/Makefile.am
+++ /dev/null
@@ -1,96 +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.
-
-noinst_SCRIPTS = run
-noinst_DATA = etap.beam test_util.beam test_web.beam
-
-noinst_PROGRAMS = test_cfg_register
-test_cfg_register_SOURCES = test_cfg_register.c
-test_cfg_register_CFLAGS = -D_BSD_SOURCE
-
-%.beam: %.erl
-       $(ERLC) $<
-
-run: run.tpl
-       sed -e "s|%abs_top_srcdir%|@abs_top_srcdir@|g" \
-           -e "s|%abs_top_builddir%|@abs_top_builddir@|g" > \
-       $@ < $<
-       chmod +x $@
-
-# @@ wildcards are NOT portable, please replace with clean-local rules
-CLEANFILES = run *.beam
-DISTCLEANFILES = temp.*
-
-EXTRA_DIST = \
-    run.tpl \
-    test_web.erl \
-    001-load.t \
-    002-icu-driver.t \
-    010-file-basics.t \
-    011-file-headers.t \
-    020-btree-basics.t \
-    021-btree-reductions.t \
-    030-doc-from-json.t \
-    031-doc-to-json.t \
-    040-util.t \
-    041-uuid-gen-id.ini \
-    041-uuid-gen-seq.ini \
-    041-uuid-gen-utc.ini \
-    041-uuid-gen.t \
-    042-work-queue.t \
-    050-stream.t \
-    060-kt-merging.t \
-    061-kt-missing-leaves.t \
-    062-kt-remove-leaves.t \
-    063-kt-get-leaves.t \
-    064-kt-counting.t \
-    065-kt-stemming.t \
-    070-couch-db.t \
-    072-cleanup.t \
-    073-changes.t \
-    074-doc-update-conflicts.t \
-    075-auth-cache.t \
-    076-file-compression.t \
-    080-config-get-set.t \
-    081-config-override.1.ini \
-    081-config-override.2.ini \
-    081-config-override.t \
-    082-config-register.t \
-    083-config-no-files.t \
-    090-task-status.t \
-    100-ref-counter.t \
-    120-stats-collect.t \
-    121-stats-aggregates.cfg \
-    121-stats-aggregates.ini \
-    121-stats-aggregates.t \
-    130-attachments-md5.t \
-    140-attachment-comp.t \
-    150-invalid-view-seq.t \
-    160-vhosts.t \
-    170-os-daemons.es \
-    170-os-daemons.t \
-    171-os-daemons-config.es \
-    171-os-daemons-config.t \
-    172-os-daemon-errors.1.sh \
-    172-os-daemon-errors.2.sh \
-    172-os-daemon-errors.3.sh \
-    172-os-daemon-errors.4.sh \
-    172-os-daemon-errors.t \
-    173-os-daemon-cfg-register.t \
-    180-http-proxy.ini \
-    180-http-proxy.t \
-    190-json-stream-parse.t \
-    200-view-group-no-db-leaks.t \
-    201-view-group-shutdown.t \
-    210-os-proc-pool.t \
-    220-compaction-daemon.t \
-    231-cors.t

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/test/javascript/Makefile.am
----------------------------------------------------------------------
diff --git a/test/javascript/Makefile.am b/test/javascript/Makefile.am
deleted file mode 100644
index d7367e0..0000000
--- a/test/javascript/Makefile.am
+++ /dev/null
@@ -1,26 +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.
-
-EXTRA_DIST = \
-       cli_runner.js \
-       couch_http.js \
-       run.tpl
-
-noinst_SCRIPTS = run
-CLEANFILES = run
-
-run: run.tpl
-       sed -e "s|%abs_top_srcdir%|$(abs_top_srcdir)|" \
-               -e "s|%abs_top_builddir%|$(abs_top_builddir)|" \
-               -e "s|%localstaterundir%|$(abs_top_builddir)/tmp/run|g" \
-       < $< > $@
-       chmod +x $@

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/test/view_server/Makefile.am
----------------------------------------------------------------------
diff --git a/test/view_server/Makefile.am b/test/view_server/Makefile.am
deleted file mode 100644
index 11e7feb..0000000
--- a/test/view_server/Makefile.am
+++ /dev/null
@@ -1,15 +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.
-
-EXTRA_DIST = \
-       query_server_spec.rb \
-       run_native_process.es

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index eb8ec43..0000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,38 +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.
-
-noinst_SCRIPTS = run
-
-CLEANFILES = $(noinst_SCRIPTS)
-
-transform = @program_transform_name@
-couchdb_command_name = `echo couchdb | sed '$(transform)'`
-
-run: ../bin/couchdb.tpl
-       sed -e "s|%ERL%|$(ERL)|g" \
-           -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
-           -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
-           -e "s|%defaultini%|default_dev.ini|g" \
-           -e "s|%localini%|local_dev.ini|g" \
-           -e "s|%localerlanglibdir%|$(abs_top_builddir)\/src|g" \
-           -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
-           -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
-           -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
-           -e "s|%localstatedir%|$(abs_top_builddir)/tmp|g" \
-           -e "s|%bug_uri%|@bug_uri@|g" \
-           -e "s|%package_author_address%|@package_author_address@|g" \
-           -e "s|%package_author_name%|@package_author_name@|g" \
-           -e "s|%package_name%|@package_name@|g" \
-           -e "s|%version%|@version@|g" \
-           -e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
-       $@ < $<
-       chmod +x $@

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f84eb4fc/var/Makefile.am
----------------------------------------------------------------------
diff --git a/var/Makefile.am b/var/Makefile.am
deleted file mode 100644
index 901ab2b..0000000
--- a/var/Makefile.am
+++ /dev/null
@@ -1,23 +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.
-
-install-data-hook:
-       if test ! "$(mkdir_p)" = ""; then \
-           $(mkdir_p) "$(DESTDIR)$(localstatelibdir)"; \
-           $(mkdir_p) "$(DESTDIR)$(localstatelogdir)"; \
-           $(mkdir_p) "$(DESTDIR)$(localstaterundir)"; \
-       else \
-           echo "WARNING: You may have to create these directories by hand."; \
-           mkdir -p "$(DESTDIR)$(localstatelibdir)"; \
-           mkdir -p "$(DESTDIR)$(localstatelogdir)"; \
-           mkdir -p "$(DESTDIR)$(localstaterundir)"; \
-       fi

Reply via email to