From 60a85ea1784778abed4b39448cdfebb6bcb0d78d Mon Sep 17 00:00:00 2001 From: Mihai Balea Date: Wed, 14 Sep 2011 16:37:49 -0400 Subject: [PATCH 1/3] Tweak rebar.config to improve out of the box build-ability --- rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index 819a722..2a3e8aa 100644 --- a/rebar.config +++ b/rebar.config @@ -2,7 +2,7 @@ {lib_dirs, ["deps", "deps/jsx/deps/","deps/ex_uri/deps"]}. {erl_opts, [debug_info, {i,"deps/proper/include/"}, - {i,"deps/ex_uri/include/"} + {i, "deps"} ]}. {post_hooks, [{'get-deps', "git submodule init"}, {'get-deps', "git submodule update"}, From c777d15ef24d22bba2df90785ea2a7c6a3894680 Mon Sep 17 00:00:00 2001 From: Mihai Balea Date: Mon, 19 Sep 2011 11:32:46 -0400 Subject: [PATCH 2/3] Fix the fix for issue #61 (build problems with ex_uri.hrl) --- rebar.config | 3 +-- src/socketio_listener.erl | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/rebar.config b/rebar.config index deedf89..01d8172 100644 --- a/rebar.config +++ b/rebar.config @@ -2,8 +2,7 @@ {lib_dirs, ["deps", "deps/jsx/deps/","deps/ex_uri/deps"]}. {erl_opts, [debug_info, {i,"deps/proper/include/"}, - {i,"deps/ex_uri/include/"}, - {d,'COMPILING_WITH_REBAR_AND_ERLC_HATES_DEPS'} + {i,"deps/"} ]}. {post_hooks, [{'get-deps', "git submodule init"}, {'get-deps', "git submodule update"}, diff --git a/src/socketio_listener.erl b/src/socketio_listener.erl index cf1ae61..fe832cf 100644 --- a/src/socketio_listener.erl +++ b/src/socketio_listener.erl @@ -1,11 +1,7 @@ -module(socketio_listener). -behaviour(gen_server). --ifdef(COMPILING_WITH_REBAR_AND_ERLC_HATES_DEPS). --include_lib("ex_uri.hrl"). --else. --include_lib("ex_uri/deps/ex_uri.hrl"). --endif. +-include("ex_uri/include/ex_uri.hrl"). %% API -export([start/1, server/1]). From de2f6cc6c542856f795419ea6c9e7d2af013990e Mon Sep 17 00:00:00 2001 From: Mihai Balea Date: Mon, 19 Sep 2011 12:15:24 -0400 Subject: [PATCH 3/3] Tweak rebar.conf to behave better when socketio is compiled as a dependency of a larger rebar application --- rebar.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index 01d8172..232cc52 100644 --- a/rebar.config +++ b/rebar.config @@ -2,7 +2,8 @@ {lib_dirs, ["deps", "deps/jsx/deps/","deps/ex_uri/deps"]}. {erl_opts, [debug_info, {i,"deps/proper/include/"}, - {i,"deps/"} + {i,"deps/"}, + {i, "../"} ]}. {post_hooks, [{'get-deps', "git submodule init"}, {'get-deps', "git submodule update"},