Permalink
Browse files

Remove spurious dependencies. We keep cowboy because it has the cowbo…

…y behaviours mentioned in source, and JSON because .. well so we don't have to have the entirety to mochiweb.
  • Loading branch information...
1 parent 6cd71fb commit 2423565395f4c6670f581006826196dda7719df5 @squaremo squaremo committed Oct 25, 2011
Showing with 17 additions and 11 deletions.
  1. +15 −5 Makefile
  2. +2 −6 rebar.config
View
@@ -1,16 +1,21 @@
-JSON=mochijson2
+JSON=eep0018
HTTP=cowboy
-all: deps
+.PHONY: all deps test test-prep clean distclean
+
+all: deps deps/$(HTTP)
+ make -C deps/$(HTTP)
rebar compile
deps:
+ -rebar get-deps
+# git:// URLs don't work behind some proxies. Grr.
+ sed -i 's|git:|https:|g' deps/cowboy/rebar.config
rebar get-deps
test: test-prep all
- erl -pa ebin -pa deps/misultin/ebin -pa deps/mochiweb/ebin \
- -pa deps/cowboy/ebin -pa deps/quoted/ebin \
- -pa deps/eep0018/ebin -sockjs json_impl $(JSON) \
+ erl -pa ebin deps/$(HTTP)/ebin deps/$(HTTP)/deps/*/ebin \
+ -pa deps/json/ebin -sockjs json_impl $(JSON) \
-sockjs http_impl $(HTTP) \
-run sockjs_test
@@ -28,6 +33,11 @@ deps/sockjs-client:
cd deps && \
git clone https://github.com/sockjs/sockjs-client.git
+deps/misultin:
+ -mkdir -p deps
+ cd deps && \
+ git clone -b dev https://github.com/ostinelli/misultin.git
+
clean::
rebar clean
rm -rf priv/www
View
@@ -1,10 +1,6 @@
{deps, [
- {misultin, ".*",
- {git, "https://github.com/ostinelli/misultin.git", {branch, "dev"}}},
{cowboy, ".*",
- {git, "https://github.com/extend/cowboy.git", "381c1780738cbb02f0065f92991bc43ccd53a0c5"}},
- {mochiweb, ".*",
- {git, "https://github.com/mochi/mochiweb.git", {tag, "v2.2.1"}}},
+ {git, "https://github.com/extend/cowboy.git", {branch, "master"}}},
{json, ".*",
- {git, "https://github.com/davisp/eep0018.git", "11cf3c9e9445c268380736a102889b9f48aeafcb"}}
+ {git, "https://github.com/davisp/eep0018.git", {branch, "master"}}}
]}.

0 comments on commit 2423565

Please sign in to comment.