Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

see details #4

Closed
wants to merge 4 commits into from
Closed

see details #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abe50d2
fix makefile bug
jameszhou Dec 15, 2012
77166ba
fix rebar compile bug
jameszhou Dec 15, 2012
61fde3a
fix makefile bug
jameszhou Dec 15, 2012
65a8985
fix whistle_apps start bug
jameszhou Dec 16, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ ROOT = .
DIALYZER = dialyzer
REBAR = $(ROOT)/bin/rebar

MAKEDIRS = lib/rabbitmq_server-2.8.6/Makefile \
lib/rabbitmq_client-2.8.6/Makefile \
lib/lager-1.0.0/Makefile \
lib/*/Makefile \
MAKEDIRS = lib/*/Makefile \
ecallmgr/Makefile \
whistle_apps/Makefile

Expand Down
1 change: 1 addition & 0 deletions lib/rabbitmq_client-2.8.6/common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ifndef TMPDIR
TMPDIR := /tmp
endif

ERL_LIBS=../
EBIN_DIR=ebin
BROKER_DIR=../rabbitmq_server-2.8.6
export INCLUDE_DIR=include
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/conference/rebar.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
,debug_info
]}. % uncomment to get debug messages, remove debug_info for production
{dialyzer_opts, [{warnings, [unmatched_returns, race_conditions, error_handling]}]}.
{lib_dirs, ["../lib"]}.
{lib_dirs, ["../../../lib","../../lib"]}.
1 change: 1 addition & 0 deletions whistle_apps/src/whistle_apps.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ start_deps() ->
whistle_apps_deps:ensure(),

lager:start(),
application:start(cowboy),

case application:get_env(reloader) of
{ok, true} -> reloader:start();
Expand Down