Rebar.config should pull cowboy by default.

RoadRunnr · Feb 16, 2012 · 8f8734c · 8f8734c
1 parent ea56424
commit 8f8734c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 28 deletions.
diff --git a/Makefile b/Makefile
@@ -5,11 +5,7 @@ all: deps
 	$(REBAR) compile
 
 deps:
-	$(REBAR) -C rebar-misultin.config get-deps
-	$(REBAR) -C rebar-cowboy.config get-deps
 	$(REBAR) get-deps
-	$(REBAR) -C rebar-misultin.config compile
-	$(REBAR) -C rebar-cowboy.config compile
 
 clean::
 	$(REBAR) clean

diff --git a/README.md b/README.md
@@ -59,8 +59,8 @@ You may need a recent version of Erlang/OTP, at least R14B is recommended.
 To run Cowboy example:
 
     cd sockjs-erlang
-    ./rebar -C rebar-cowboy.config get-deps
-    ./rebar -C rebar-cowboy.config compile
+    ./rebar get-deps
+    ./rebar compile
     ./examples/cowboy_echo.erl
 
 This will start a simple `/echo` SockJS server on
@@ -170,8 +170,8 @@ testing.
 To run Cowboy test_server:
 
     cd sockjs-erlang
-    ./rebar -C rebar-cowboy.config get-deps
-    ./rebar -C rebar-cowboy.config compile
+    ./rebar get-deps
+    ./rebar compile
     ./examples/cowboy_test_server.erl
 
 That should start test_server on port 8081. Currently, there are two

diff --git a/rebar-cowboy.config b/rebar-cowboy.config
diff --git a/rebar.config b/rebar.config
@@ -1,9 +1,6 @@
 %% -*- erlang -*-
 %% This is the default `rebar.config` for SockJS-erlang.
 %%
-%% When chaning please remember to update `rebar-cowboy.config` and
-%% `rebar-misultin.config`.
-%%
 
 {erl_opts, [
             %% fail_on_warning,
@@ -14,4 +11,6 @@
 ]}.
 
 {deps, [
+        {cowboy, ".*",
+         {git, "git://github.com/extend/cowboy.git", "e7b6e2a402922724"}}
        ]}.