0.2 project structure

.gitignore

@@ -1,6 +1,12 @@
-lib
+.eunit
+deps
+!deps/.placeholder
+*.o
+*.beam
+*.plt
+erl_crash.dump
 ebin
-var
-*.log
 rel/emqtt
-
+.concrete/DEV_MODE
+.rebar
+test/ebin/*.beam

Makefile

@@ -9,8 +9,5 @@ deps:
 clean:
 	./rebar clean
 
-generate:
+dist:
 	./rebar generate -f
-
-relclean:
-	rm -rf rel/emqtt

rebar.config

@@ -1,18 +1,16 @@
-{require_min_otp_vsn, "R15"}.
+{require_min_otp_vsn, "R17"}.
 
 {erl_opts, [debug_info, {parse_transform, lager_transform}]}.
 
 {erl_opts, [{i, "include"},
-			{src_dirs, ["src", "test"]}]}.
+			{src_dirs, ["src"]}]}.
 
-{sub_dirs, ["rel"]}.
+{sub_dirs, [
-
+    "rel", 
-{lib_dirs,["lib", "plugins"]}.
+    "apps/emqtt"]}.
-
-{deps_dir, ["lib"]}.
 
 {deps, [
 	{lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}},
-	{elog, ".*", {git, "git://github.com/erylee/elog.git", {branch, "master"}}},
+	{esockd, ".*", {git, "git://github.com/slimpp/esockd.git", {branch, "master"}}},
-	{folsom, ".*", {git, "git://github.com/boundary/folsom.git", {branch, "master"}}}
+	{mochiweb, ".*", {git, "git@github.com:slimpp/mochiweb.git", {branch, "master"}}}
 ]}.