Feng Lee 11 лет назад
Родитель
Сommit
3a6ed9a876
38 измененных файлов с 18 добавлено и 17 удалено
  1. 10 4
      .gitignore
  2. 1 4
      Makefile
  3. 0 0
      apps/emqtt/include/emqtt.hrl
  4. 0 0
      apps/emqtt/include/emqtt_frame.hrl
  5. 0 0
      apps/emqtt/include/emqtt_internal.hrl
  6. 0 0
      apps/emqtt/src/emqtt.app.src
  7. 0 0
      apps/emqtt/src/emqtt.erl
  8. 0 0
      apps/emqtt/src/emqtt_app.erl
  9. 0 0
      apps/emqtt/src/emqtt_auth.erl
  10. 0 0
      apps/emqtt/src/emqtt_auth_anonymous.erl
  11. 0 0
      apps/emqtt/src/emqtt_auth_internal.erl
  12. 0 0
      apps/emqtt/src/emqtt_client.erl
  13. 0 0
      apps/emqtt/src/emqtt_client_monitor.erl
  14. 0 0
      apps/emqtt/src/emqtt_client_sup.erl
  15. 0 0
      apps/emqtt/src/emqtt_ctl.erl
  16. 0 0
      apps/emqtt/src/emqtt_db.erl
  17. 0 0
      apps/emqtt/src/emqtt_frame.erl
  18. 0 0
      apps/emqtt/src/emqtt_keep_alive.erl
  19. 0 0
      apps/emqtt/src/emqtt_lib.erl
  20. 0 0
      apps/emqtt/src/emqtt_listener.erl
  21. 0 0
      apps/emqtt/src/emqtt_monitor.erl
  22. 0 0
      apps/emqtt/src/emqtt_net.erl
  23. 0 0
      apps/emqtt/src/emqtt_registry.erl
  24. 0 0
      apps/emqtt/src/emqtt_retained.erl
  25. 0 0
      apps/emqtt/src/emqtt_router.erl
  26. 0 0
      apps/emqtt/src/emqtt_sup.erl
  27. 0 0
      apps/emqtt/src/emqtt_topic.erl
  28. 0 0
      apps/emqtt/src/file_handle_cache.erl
  29. 0 0
      apps/emqtt/src/gen_server2.erl
  30. 0 0
      apps/emqtt/src/priority_queue.erl
  31. 0 0
      apps/emqtt/src/supervisor2.erl
  32. 0 0
      apps/emqtt/src/tcp_acceptor.erl
  33. 0 0
      apps/emqtt/src/tcp_acceptor_sup.erl
  34. 0 0
      apps/emqtt/src/tcp_listener.erl
  35. 0 0
      apps/emqtt/src/tcp_listener_sup.erl
  36. 0 0
      deps/.placeholder
  37. BIN
      rebar
  38. 7 9
      rebar.config

+ 10 - 4
.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

+ 1 - 4
Makefile

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

include/emqtt.hrl → apps/emqtt/include/emqtt.hrl


include/emqtt_frame.hrl → apps/emqtt/include/emqtt_frame.hrl


include/emqtt_internal.hrl → apps/emqtt/include/emqtt_internal.hrl


src/emqtt.app.src → apps/emqtt/src/emqtt.app.src


src/emqtt.erl → apps/emqtt/src/emqtt.erl


src/emqtt_app.erl → apps/emqtt/src/emqtt_app.erl


src/emqtt_auth.erl → apps/emqtt/src/emqtt_auth.erl


src/emqtt_auth_anonymous.erl → apps/emqtt/src/emqtt_auth_anonymous.erl


src/emqtt_auth_internal.erl → apps/emqtt/src/emqtt_auth_internal.erl


src/emqtt_client.erl → apps/emqtt/src/emqtt_client.erl


src/emqtt_client_monitor.erl → apps/emqtt/src/emqtt_client_monitor.erl


src/emqtt_client_sup.erl → apps/emqtt/src/emqtt_client_sup.erl


src/emqtt_ctl.erl → apps/emqtt/src/emqtt_ctl.erl


src/emqtt_db.erl → apps/emqtt/src/emqtt_db.erl


src/emqtt_frame.erl → apps/emqtt/src/emqtt_frame.erl


src/emqtt_keep_alive.erl → apps/emqtt/src/emqtt_keep_alive.erl


src/emqtt_lib.erl → apps/emqtt/src/emqtt_lib.erl


src/emqtt_listener.erl → apps/emqtt/src/emqtt_listener.erl


src/emqtt_monitor.erl → apps/emqtt/src/emqtt_monitor.erl


src/emqtt_net.erl → apps/emqtt/src/emqtt_net.erl


src/emqtt_registry.erl → apps/emqtt/src/emqtt_registry.erl


src/emqtt_retained.erl → apps/emqtt/src/emqtt_retained.erl


src/emqtt_router.erl → apps/emqtt/src/emqtt_router.erl


src/emqtt_sup.erl → apps/emqtt/src/emqtt_sup.erl


src/emqtt_topic.erl → apps/emqtt/src/emqtt_topic.erl


src/file_handle_cache.erl → apps/emqtt/src/file_handle_cache.erl


src/gen_server2.erl → apps/emqtt/src/gen_server2.erl


src/priority_queue.erl → apps/emqtt/src/priority_queue.erl


src/supervisor2.erl → apps/emqtt/src/supervisor2.erl


src/tcp_acceptor.erl → apps/emqtt/src/tcp_acceptor.erl


src/tcp_acceptor_sup.erl → apps/emqtt/src/tcp_acceptor_sup.erl


src/tcp_listener.erl → apps/emqtt/src/tcp_listener.erl


src/tcp_listener_sup.erl → apps/emqtt/src/tcp_listener_sup.erl


+ 0 - 0
deps/.placeholder



+ 7 - 9
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"]}.
-
-{lib_dirs,["lib", "plugins"]}.
-
-{deps_dir, ["lib"]}.
+{sub_dirs, [
+    "rel", 
+    "apps/emqtt"]}.
 
 {deps, [
 	{lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}},
-	{elog, ".*", {git, "git://github.com/erylee/elog.git", {branch, "master"}}},
-	{folsom, ".*", {git, "git://github.com/boundary/folsom.git", {branch, "master"}}}
+	{esockd, ".*", {git, "git://github.com/slimpp/esockd.git", {branch, "master"}}},
+	{mochiweb, ".*", {git, "git@github.com:slimpp/mochiweb.git", {branch, "master"}}}
 ]}.