CBD-312 Index merger is now a separate OTP application

Change-Id: I618c9e8a45f65f1d6ade48ba6b027355fe9c4ff3
Reviewed-on: http://review.couchbase.org/16589
Reviewed-by: Damien Katz <damien@couchbase.com>
Tested-by: Volker Mische <volker.mische@gmail.com>
Reviewed-by: Volker Mische <volker.mische@gmail.com>
Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>

Author: fdmanana

Makefile

@@ -1,8 +1,8 @@
 ERL=erl
 VERSION=$(shell git describe)
 # Output ERL_COMPILER_OPTIONS env variable
-COMPILER_OPTIONS=$(shell $(ERL) -noinput +B -eval 'Options = case os:getenv("ERL_COMPILER_OPTIONS") of false -> []; Else -> {ok,Tokens,_} = erl_scan:string(Else ++ "."),{ok,Term} = erl_parse:parse_term(Tokens), Term end, io:format("~p~n", [[{i, "${COUCH_SRC}"}] ++ Options]), halt(0).')
-COMPILER_OPTIONS_MAKE_CHECK=$(shell $(ERL) -noinput +B -eval 'Options = case os:getenv("ERL_COMPILER_OPTIONS") of false -> []; Else -> {ok,Tokens,_} = erl_scan:string(Else ++ "."),{ok,Term} = erl_parse:parse_term(Tokens), Term end, io:format("~p~n", [[{i, "${COUCH_SRC}"},{d, makecheck}] ++ Options]), halt(0).')
+COMPILER_OPTIONS=$(shell $(ERL) -noinput +B -eval 'Options = case os:getenv("ERL_COMPILER_OPTIONS") of false -> []; Else -> {ok,Tokens,_} = erl_scan:string(Else ++ "."),{ok,Term} = erl_parse:parse_term(Tokens), Term end, io:format("~p~n", [[{i, "${COUCH_SRC}"}, {i, "${COUCH_SRC}/.."}] ++ Options]), halt(0).')
+COMPILER_OPTIONS_MAKE_CHECK=$(shell $(ERL) -noinput +B -eval 'Options = case os:getenv("ERL_COMPILER_OPTIONS") of false -> []; Else -> {ok,Tokens,_} = erl_scan:string(Else ++ "."),{ok,Term} = erl_parse:parse_term(Tokens), Term end, io:format("~p~n", [[{i, "${COUCH_SRC}"},{i, "${COUCH_SRC}/.."},{d, makecheck}] ++ Options]), halt(0).')
 
 all: compile
 
@@ -15,7 +15,7 @@ compileforcheck:
 buildandtest: all test
 
 runtests:
-	ERL_FLAGS="-pa ebin -pa ${COUCH_SRC} -pa ${COUCH_SRC}/../etap -pa ${COUCH_SRC}/../snappy -pa ${COUCH_SRC}/../../test/etap -pa ${COUCH_SRC}/../couch_set_view/ebin -pa ${COUCH_SRC}/../mochiweb -pa ${COUCH_SRC}/../lhttpc -pa ${COUCH_SRC}/../erlang-oauth -pa ${COUCH_SRC}/../ejson -pa ${COUCH_SRC}/../mapreduce" prove ./test/*.t
+	ERL_FLAGS="-pa ebin -pa ${COUCH_SRC} -pa ${COUCH_SRC}/../etap -pa ${COUCH_SRC}/../snappy -pa ${COUCH_SRC}/../../test/etap -pa ${COUCH_SRC}/../couch_set_view/ebin -pa ${COUCH_SRC}/../couch_index_merger/ebin -pa ${COUCH_SRC}/../mochiweb -pa ${COUCH_SRC}/../lhttpc -pa ${COUCH_SRC}/../erlang-oauth -pa ${COUCH_SRC}/../ejson -pa ${COUCH_SRC}/../mapreduce" prove ./test/*.t
 
 check: clean compileforcheck runtests
 	./rebar clean

src/geocouch/couch_httpd_spatial_merger.erl

@@ -15,7 +15,7 @@
 -export([handle_req/1]).
 
 -include("couch_db.hrl").
--include("couch_index_merger.hrl").
+-include_lib("couch_index_merger/include/couch_index_merger.hrl").
 -include("../lhttpc/lhttpc.hrl").
 
 -import(couch_util, [

src/geocouch/couch_spatial_merger.erl

@@ -17,7 +17,7 @@
     http_index_folder_req_details/3, make_event_fun/2]).
 
 -include("couch_db.hrl").
--include("couch_index_merger.hrl").
+-include_lib("couch_index_merger/include/couch_index_merger.hrl").
 -include("couch_spatial.hrl").
 
 -define(LOCAL, <<"local">>).