Apply patch by Tino Breddin (tolbrino) to rebarize repo.

nitrogen · Jan 14, 2011 · eba9953 · eba9953
1 parent d915359
commit eba9953
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 67 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,4 @@
-erl_crash.dump
+erl_crash.dump
+.eunit/
+*.beam
+*.app
diff --git a/Emakefile b/Emakefile
diff --git a/Makefile b/Makefile
@@ -1,19 +1,10 @@
 all: compile
 
 compile:
-	@mkdir -p ebin
-	@erl \
-		-pa ./ebin \
-		-make
+	@rebar compile
 
 clean:
-	@rm -rf ./ebin/*.beam
-	@rm -rf ./test_ebin/*.beam
+	@rebar clean
 
 test: compile
-	@erl \
-		-noshell \
-		-pa ./ebin \
-		-pa ./test_ebin \
-		-s eunit_helper start \
-		-s init stop
+	@rebar eunit
diff --git a/ebin/.gitignore b/ebin/.gitignore
diff --git a/ebin/simple_bridge.app b/ebin/simple_bridge.app
diff --git a/rebar b/rebar
diff --git a/rebar.config b/rebar.config
@@ -0,0 +1,4 @@
+% -*- Erlang -*-
+{erl_opts, [fail_on_warning, debug_info]}.
+{cover_enabled, true}.
+{xref_checks, [undefined_function_calls]}.
diff --git a/src/simple_bridge.app.src b/src/simple_bridge.app.src
@@ -0,0 +1,6 @@
+{application, simple_bridge, [
+    {description,  "SimpleBridge - Common Interface to Erlang HTTP Servers"},
+    {vsn,          "1.1.1"},
+    {applications, [kernel, stdlib, sasl]},
+    {registered, []}
+]}.
diff --git a/test/eunit_helper.erl b/test/eunit_helper.erl
diff --git a/test/utils.erl b/test/utils.erl
@@ -4,15 +4,15 @@
 
 make_inets_get_bridge() ->
     % Construct the inets bridge...
-    {ok, [InetsRequest] } = file:consult("data/inets_get_request_data"),
+    {ok, [InetsRequest] } = file:consult("../data/inets_get_request_data"),
     {ok, Socket} = gen_tcp:connect(?PEER_IP, ?PEER_PORT, []),
     InetsRequest1 = inject_socket(InetsRequest, Socket),
     InetsBridge = simple_bridge:make_request(inets_request_bridge, InetsRequest1),
     InetsBridge.
 
 make_inets_post_bridge() ->
     % Construct the inets bridge...
-    {ok, [InetsRequest] } = file:consult("data/inets_post_request_data"),
+    {ok, [InetsRequest] } = file:consult("../data/inets_post_request_data"),
     {ok, Socket} = gen_tcp:connect(?PEER_IP, ?PEER_PORT, []),
     InetsRequest1 = inject_socket(InetsRequest, Socket),
     InetsBridge = simple_bridge:make_request(inets_request_bridge, InetsRequest1),

diff --git a/test_ebin/.gitignore b/test_ebin/.gitignore