Browse files

Rebar.config should pull cowboy by default.

  • Loading branch information...
1 parent ea56424 commit 8f8734c66c4582c4f78aad858a51252da4d3b0d0 @majek majek committed Feb 16, 2012
Showing with 6 additions and 28 deletions.
  1. +0 −4 Makefile
  2. +4 −4 README.md
  3. +0 −17 rebar-cowboy.config
  4. +2 −3 rebar.config
View
4 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
View
8 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
View
17 rebar-cowboy.config
@@ -1,17 +0,0 @@
-%% -*- erlang -*-
-%% When chaning please remember to update `rebar.config` and
-%% `rebar-misultin.config`.
-%%
-
-{erl_opts, [
- %% fail_on_warning,
- bin_opt_info,
- warn_missing_spec,
- debug_info,
- warn_export_all
-]}.
-
-{deps, [
- {cowboy, ".*",
- {git, "git://github.com/extend/cowboy.git", "e7b6e2a402922724"}}
- ]}.
View
5 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"}}
]}.

0 comments on commit 8f8734c

Please sign in to comment.